Simplify av_close_input_file similarly to av_open_input_file previously
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Mon, 17 Dec 2007 19:12:43 +0000 (19:12 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Mon, 17 Dec 2007 19:12:43 +0000 (19:12 +0000)
Originally committed as revision 11254 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavformat/utils.c

index 949e2a8..1a34049 100644 (file)
@@ -2041,7 +2041,7 @@ int av_read_pause(AVFormatContext *s)
 
 void av_close_input_file(AVFormatContext *s)
 {
 
 void av_close_input_file(AVFormatContext *s)
 {
-    int i, must_open_file;
+    int i;
     AVStream *st;
 
     /* free previous packet */
     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);
         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);
         url_fclose(s->pb);
-    }
     av_freep(&s->priv_data);
     av_free(s);
 }
     av_freep(&s->priv_data);
     av_free(s);
 }