[FFmpeg-cvslog] Remove code that duplicates existing code a few lines down.

Reimar Döffinger git at videolan.org
Mon Sep 17 21:18:09 CEST 2012


ffmpeg | branch: master | Reimar Döffinger <Reimar.Doeffinger at gmx.de> | Mon Sep 17 21:16:32 2012 +0200| [07d2d063954251bdefe34d7d1f8de751eec606be] | committer: Reimar Döffinger

Remove code that duplicates existing code a few lines down.

This also fixes a potential crash since s->pb can be NULL.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger at gmx.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=07d2d063954251bdefe34d7d1f8de751eec606be
---

 libavformat/utils.c |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 7152401..f6a20ca 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3787,9 +3787,6 @@ int av_write_trailer(AVFormatContext *s)
     if (s->oformat->write_trailer)
         ret = s->oformat->write_trailer(s);
 
-    if (!(s->oformat->flags & AVFMT_NOFILE))
-        avio_flush(s->pb);
-
 fail:
     if (s->pb)
        avio_flush(s->pb);



More information about the ffmpeg-cvslog mailing list