[FFmpeg-cvslog] avformat/mux: call deinit if write_header fails

[Marton Balint]

ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Jun 11 18:52:27 2016 +0200| [301ead131381d83e9ff0167b9094b04bde156f79] | committer: Marton Balint

avformat/mux: call deinit if write_header fails

Docs clearly states that av_write_trailer should only be called if
avformat_write_header was successful, therefore we have to deinit if we return
failure.

Signed-off-by: Marton Balint <cus at passwd.hu>

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

 libavformat/mux.c |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/libavformat/mux.c b/libavformat/mux.c
index 91388e3..bef230f 100644
--- a/libavformat/mux.c
+++ b/libavformat/mux.c
@@ -485,14 +485,14 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
         if (ret >= 0 && s->pb && s->pb->error < 0)
             ret = s->pb->error;
         if (ret < 0)
-            return ret;
+            goto fail;
         if (s->flush_packets && s->pb && s->pb->error >= 0 && s->flags & AVFMT_FLAG_FLUSH_PACKETS)
             avio_flush(s->pb);
         s->internal->header_written = 1;
     }
 
     if ((ret = init_pts(s)) < 0)
-        return ret;
+        goto fail;
 
     if (s->avoid_negative_ts < 0) {
         av_assert2(s->avoid_negative_ts == AVFMT_AVOID_NEG_TS_AUTO);
@@ -503,6 +503,11 @@ int avformat_write_header(AVFormatContext *s, AVDictionary **options)
     }
 
     return 0;
+
+fail:
+    if (s->oformat->deinit)
+        s->oformat->deinit(s);
+    return ret;
 }
 
 #define AV_PKT_FLAG_UNCODED_FRAME 0x2000