From 6e69f6c47f844f6991afb0275a56b1c18663b162 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Mon, 22 Mar 2010 14:42:52 +0000 Subject: [PATCH] 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. Originally committed as revision 22630 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index a0e0b9e1a..160495b5f 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1296,10 +1296,9 @@ static int rtsp_read_play(AVFormatContext *s) 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) -- 2.11.0