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
This commit is contained in:
Martin Storsjö 2010-03-22 14:42:52 +00:00
parent 0e22d68834
commit 6e69f6c47f

View File

@ -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)