Skip to content
Snippets Groups Projects
Commit 6e69f6c4 authored by Martin Storsjö's avatar Martin Storsjö
Browse files

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
parent 0e22d688
No related branches found
No related tags found
No related merge requests found
...@@ -1296,10 +1296,9 @@ static int rtsp_read_play(AVFormatContext *s) ...@@ -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: ...@@ -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)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment