xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-06 12:07:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make rtsp_close_streams() take a AVFormatContext instead of a RTSPState

Browse Source 
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
This commit is contained in:
Martin Storsjö 2010-02-19 23:10:19 +00:00 committed by Ronald S. Bultje
parent 4689ac41e9
commit 52aa4338cc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavformat/rtsp.c
View File

@ -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;
}