Browse code

rtsp: Pass the method name to ff_rtsp_parse_line

Originally committed as revision 26191 to svn://svn.ffmpeg.org/ffmpeg/trunk

Martin Storsjö authored on 2011/01/02 19:10:12
Showing 3 changed files
... ...
@@ -2895,7 +2895,7 @@ static int rtsp_parse_request(HTTPContext *c)
2895 2895
             len = sizeof(line) - 1;
2896 2896
         memcpy(line, p, len);
2897 2897
         line[len] = '\0';
2898
-        ff_rtsp_parse_line(header, line, NULL);
2898
+        ff_rtsp_parse_line(header, line, NULL, NULL);
2899 2899
         p = p1 + 1;
2900 2900
     }
2901 2901
 
... ...
@@ -685,7 +685,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
685 685
 }
686 686
 
687 687
 void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
688
-                        RTSPState *rt)
688
+                        RTSPState *rt, const char *method)
689 689
 {
690 690
     const char *p;
691 691
 
... ...
@@ -808,7 +808,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
808 808
             reply->status_code = atoi(buf1);
809 809
             av_strlcpy(reply->reason, p, sizeof(reply->reason));
810 810
         } else {
811
-            ff_rtsp_parse_line(reply, p, rt);
811
+            ff_rtsp_parse_line(reply, p, rt, method);
812 812
             av_strlcat(rt->last_reply, p,    sizeof(rt->last_reply));
813 813
             av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply));
814 814
         }
... ...
@@ -353,7 +353,7 @@ typedef struct RTSPStream {
353 353
 } RTSPStream;
354 354
 
355 355
 void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
356
-                        RTSPState *rt);
356
+                        RTSPState *rt, const char *method);
357 357
 
358 358
 extern int rtsp_rtp_port_min;
359 359
 extern int rtsp_rtp_port_max;