Commit 52aa4338 authored by Martin Storsjö's avatar Martin Storsjö Committed by Ronald S. Bultje
Browse files

Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState

argument, so we can use AVFormatContext->* here in the future.

Patch by Martin Storsjö <$firstname $firstname st>.

Originally committed as revision 21911 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4689ac41
......@@ -572,8 +572,9 @@ static int sdp_parse(AVFormatContext *s, const char *content)
}
/* close and free RTSP streams */
static void rtsp_close_streams(RTSPState *rt)
static void rtsp_close_streams(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
int i;
RTSPStream *rtsp_st;
......@@ -1421,7 +1422,7 @@ redirect:
}
return 0;
fail:
rtsp_close_streams(rt);
rtsp_close_streams(s);
av_freep(&content);
url_close(rt->rtsp_hd);
if (reply->status_code >=300 && reply->status_code < 400) {
......@@ -1759,7 +1760,7 @@ static int rtsp_read_close(AVFormatContext *s)
s->filename);
rtsp_send_cmd_async(s, cmd);
rtsp_close_streams(rt);
rtsp_close_streams(s);
url_close(rt->rtsp_hd);
return 0;
}
......@@ -1839,14 +1840,13 @@ static int sdp_read_header(AVFormatContext *s, AVFormatParameters *ap)
}
return 0;
fail:
rtsp_close_streams(rt);
rtsp_close_streams(s);
return err;
}
static int sdp_read_close(AVFormatContext *s)
{
RTSPState *rt = s->priv_data;
rtsp_close_streams(rt);
rtsp_close_streams(s);
return 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment