rtsp: Pass the method name to ff_rtsp_parse_line

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

diff --git a/ffserver.c b/ffserver.c
index fcc3359a41f8ee8241bed6980842b2566cd70d9d..64bcb9beb901fb043cc8d55b02e2d1984e2eb88b 100644 (file)
--- a/ffserver.c
+++ b/ffserver.c
@@ -2895,7 +2895,7 @@ static int rtsp_parse_request(HTTPContext *c)
             len = sizeof(line) - 1;
         memcpy(line, p, len);
         line[len] = '\0';
-        ff_rtsp_parse_line(header, line, NULL);
+        ff_rtsp_parse_line(header, line, NULL, NULL);
         p = p1 + 1;
     }
 

diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c
index bc7e4e1b22aa4d079965e35b2ee7279384d5a396..4ba5cefbfbc9f913c7f45fb06c73d98ffde050df 100644 (file)
--- a/libavformat/rtsp.c
+++ b/libavformat/rtsp.c
@@ -685,7 +685,7 @@ static void rtsp_parse_transport(RTSPMessageHeader *reply, const char *p)
 }
 
 void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
-                        RTSPState *rt)
+                        RTSPState *rt, const char *method)
 {
     const char *p;
 
@@ -808,7 +808,7 @@ int ff_rtsp_read_reply(AVFormatContext *s, RTSPMessageHeader *reply,
             reply->status_code = atoi(buf1);
             av_strlcpy(reply->reason, p, sizeof(reply->reason));
         } else {
-            ff_rtsp_parse_line(reply, p, rt);
+            ff_rtsp_parse_line(reply, p, rt, method);
             av_strlcat(rt->last_reply, p,    sizeof(rt->last_reply));
             av_strlcat(rt->last_reply, "\n", sizeof(rt->last_reply));
         }

diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h
index fbe9e1a6898eded7d6f35f422c088f9247b9b048..2680297c294ad3caffee9163669c13cf91e828a2 100644 (file)
--- a/libavformat/rtsp.h
+++ b/libavformat/rtsp.h
@@ -353,7 +353,7 @@ typedef struct RTSPStream {
 } RTSPStream;
 
 void ff_rtsp_parse_line(RTSPMessageHeader *reply, const char *buf,
-                        RTSPState *rt);
+                        RTSPState *rt, const char *method);
 
 extern int rtsp_rtp_port_min;
 extern int rtsp_rtp_port_max;