[FFmpeg-cvslog] r22630 - trunk/libavformat/rtsp.c

[mstorsjo]

Author: mstorsjo
Date: Mon Mar 22 15:42:52 2010
New Revision: 22630

Log:
Use the caller's RTSPMessageHeader in rtsp_setup_input_streams
    
Currently, the caller doesn't get the status_code and location for rediects,
since rtsp_setup_input_streams uses a copy of RTSPMessageHeader of its own.

Modified:
   trunk/libavformat/rtsp.c

Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c	Mon Mar 22 15:26:17 2010	(r22629)
+++ trunk/libavformat/rtsp.c	Mon Mar 22 15:42:52 2010	(r22630)
@@ -1296,10 +1296,9 @@ static int rtsp_read_play(AVFormatContex
     return 0;
 }
 
-static int rtsp_setup_input_streams(AVFormatContext *s)
+static int rtsp_setup_input_streams(AVFormatContext *s, RTSPMessageHeader *reply)
 {
     RTSPState *rt = s->priv_data;
-    RTSPMessageHeader reply1, *reply = &reply1;
     char cmd[1024];
     unsigned char *content = NULL;
     int ret;
@@ -1531,7 +1530,7 @@ redirect:
     }
 
     if (s->iformat)
-        err = rtsp_setup_input_streams(s);
+        err = rtsp_setup_input_streams(s, reply);
     else
         err = rtsp_setup_output_streams(s, host);
     if (err)