[FFmpeg-cvslog] avformat/4xm: Simplify cleanup after read_header failure

Andreas Rheinhardt git at videolan.org
Thu Jul 8 16:44:00 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [f7fb09cb001d32e55cf280ca8434de0049146552] | committer: Andreas Rheinhardt

avformat/4xm: Simplify cleanup after read_header failure

by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

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

 libavformat/4xm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/4xm.c b/libavformat/4xm.c
index 427eaaddd0..f918b1fc57 100644
--- a/libavformat/4xm.c
+++ b/libavformat/4xm.c
@@ -283,7 +283,6 @@ static int fourxm_read_header(AVFormatContext *s)
 
     return 0;
 fail:
-    av_freep(&fourxm->tracks);
     av_free(header);
     return ret;
 }
@@ -397,6 +396,7 @@ const AVInputFormat ff_fourxm_demuxer = {
     .name           = "4xm",
     .long_name      = NULL_IF_CONFIG_SMALL("4X Technologies"),
     .priv_data_size = sizeof(FourxmDemuxContext),
+    .flags_internal = FF_FMT_INIT_CLEANUP,
     .read_probe     = fourxm_probe,
     .read_header    = fourxm_read_header,
     .read_packet    = fourxm_read_packet,



More information about the ffmpeg-cvslog mailing list