From ca75a92325f77aaadb234e947c6242c3344233e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Mon, 17 Dec 2007 19:12:43 +0000 Subject: [PATCH] Simplify av_close_input_file similarly to av_open_input_file previously Originally committed as revision 11254 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 949e2a88b..1a34049c2 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2041,7 +2041,7 @@ int av_read_pause(AVFormatContext *s) void av_close_input_file(AVFormatContext *s) { - int i, must_open_file; + int i; AVStream *st; /* free previous packet */ @@ -2068,13 +2068,8 @@ void av_close_input_file(AVFormatContext *s) av_freep(&s->programs[i]); } flush_packet_queue(s); - must_open_file = 1; - if (s->iformat->flags & AVFMT_NOFILE) { - must_open_file = 0; - } - if (must_open_file) { + if (!(s->iformat->flags & AVFMT_NOFILE)) url_fclose(s->pb); - } av_freep(&s->priv_data); av_free(s); } -- 2.11.0