[FFmpeg-cvslog] r26191 - in trunk: ffserver.c libavformat/rtsp.c libavformat/rtsp.h

[mstorsjo]

Author: mstorsjo
Date: Sun Jan  2 11:10:12 2011
New Revision: 26191

Log:
rtsp: Pass the method name to ff_rtsp_parse_line

Modified:
   trunk/ffserver.c
   trunk/libavformat/rtsp.c
   trunk/libavformat/rtsp.h

Modified: trunk/ffserver.c
==============================================================================
--- trunk/ffserver.c	Sun Jan  2 11:07:56 2011	(r26190)
+++ trunk/ffserver.c	Sun Jan  2 11:10:12 2011	(r26191)
@@ -2895,7 +2895,7 @@ static int rtsp_parse_request(HTTPContex
             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;
     }
 

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Sun Jan  2 11:07:56 2011	(r26190)
+++ trunk/libavformat/rtsp.c	Sun Jan  2 11:10:12 2011	(r26191)
@@ -685,7 +685,7 @@ static void rtsp_parse_transport(RTSPMes
 }
 
 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 *
             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));
         }

Modified: trunk/libavformat/rtsp.h
==============================================================================
--- trunk/libavformat/rtsp.h	Sun Jan  2 11:07:56 2011	(r26190)
+++ trunk/libavformat/rtsp.h	Sun Jan  2 11:10:12 2011	(r26191)
@@ -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;