From 52aa4338ccae6ef699bfe886c08b66074f1aa146 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Fri, 19 Feb 2010 23:10:19 +0000 Subject: [PATCH] Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState argument, so we can use AVFormatContext->* here in the future. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Patch by Martin Storsjö <$firstname $firstname st>. Originally committed as revision 21911 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index c02bdbb..35c965c 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -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; } -- 2.7.4