opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-07-03 23:05:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use the caller's RTSPMessageHeader in rtsp_setup_input_streams

Browse Source 
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
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/rtsp.c
View File

@ -1296,10 +1296,9 @@ static int rtsp_read_play(AVFormatContext *s)
return 0; 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; RTSPState *rt = s->priv_data;
RTSPMessageHeader reply1, *reply = &reply1;
char cmd[1024]; char cmd[1024];
unsigned char *content = NULL; unsigned char *content = NULL;
int ret; int ret;
@ -1531,7 +1530,7 @@ redirect:
} }
if (s->iformat) if (s->iformat)
err = rtsp_setup_input_streams(s); err = rtsp_setup_input_streams(s, reply);
else else
err = rtsp_setup_output_streams(s, host); err = rtsp_setup_output_streams(s, host);
if (err) if (err)