From 21e40af378106ce4f5a7c9b2d177913bd5c0f7b2 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 21 Mar 2020 18:31:06 +0100 Subject: [PATCH] avformat/vividas: Simplify cleanup after read_header failure by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/vividas.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavformat/vividas.c b/libavformat/vividas.c index a7deab0e51..8d1c1dab29 100644 --- a/libavformat/vividas.c +++ b/libavformat/vividas.c @@ -613,7 +613,7 @@ static int viv_read_header(AVFormatContext *s) ret = track_index(viv, s, buf, v); av_free(buf); if (ret < 0) - goto fail; + return ret; viv->sb_offset = avio_tell(pb); if (viv->n_sb_blocks > 0) { @@ -624,9 +624,6 @@ static int viv_read_header(AVFormatContext *s) } return 0; -fail: - av_freep(&viv->sb_blocks); - return ret; } static int viv_read_packet(AVFormatContext *s, @@ -785,6 +782,7 @@ const AVInputFormat ff_vividas_demuxer = { .name = "vividas", .long_name = NULL_IF_CONFIG_SMALL("Vividas VIV"), .priv_data_size = sizeof(VividasDemuxContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = viv_probe, .read_header = viv_read_header, .read_packet = viv_read_packet,