[FFmpeg-cvslog] avformat/aiffenc: Add deinit function

[Andreas Rheinhardt]

ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Fri Oct 25 03:38:07 2019 +0200| [2e37237ff107ea7175e15fed5e2f8d8aba80e225] | committer: Michael Niedermayer

avformat/aiffenc: Add deinit function

Prevents memleaks if the trailer is never written.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

 libavformat/aiffenc.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/libavformat/aiffenc.c b/libavformat/aiffenc.c
index d37b9ae1c6..e25794d185 100644
--- a/libavformat/aiffenc.c
+++ b/libavformat/aiffenc.c
@@ -260,7 +260,7 @@ static int aiff_write_trailer(AVFormatContext *s)
         /* Write ID3 tags */
         if (aiff->write_id3v2)
             if ((ret = put_id3v2_tags(s, aiff)) < 0)
-                goto free;
+                return ret;
 
         /* File length */
         file_size = avio_tell(pb);
@@ -270,12 +270,16 @@ static int aiff_write_trailer(AVFormatContext *s)
         avio_flush(pb);
     }
 
-free:
-    ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end);
-
     return ret;
 }
 
+static void aiff_deinit(AVFormatContext *s)
+{
+    AIFFOutputContext *aiff = s->priv_data;
+
+    ff_packet_list_free(&aiff->pict_list, &aiff->pict_list_end);
+}
+
 #define OFFSET(x) offsetof(AIFFOutputContext, x)
 #define ENC AV_OPT_FLAG_ENCODING_PARAM
 static const AVOption options[] = {
@@ -304,6 +308,7 @@ AVOutputFormat ff_aiff_muxer = {
     .write_header      = aiff_write_header,
     .write_packet      = aiff_write_packet,
     .write_trailer     = aiff_write_trailer,
+    .deinit            = aiff_deinit,
     .codec_tag         = (const AVCodecTag* const []){ ff_codec_aiff_tags, 0 },
     .priv_class        = &aiff_muxer_class,
 };