mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 03:59:43 +00:00
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:
parent
0e22d68834
commit
6e69f6c47f
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user