diff options
author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2020-03-21 18:31:06 +0100 |
---|---|---|
committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-07 23:46:47 +0200 |
commit | cc768bf7e44d8d98a9b42dff47cb9deff23050d4 (patch) | |
tree | ddd2f71403cf6dd616cd89d88a3bce546f32d85f | |
parent | da45c89fe1792a12a9b0c5183fe22cf0df92814b (diff) | |
download | ffmpeg-cc768bf7e44d8d98a9b42dff47cb9deff23050d4.tar.gz |
avformat/mlvdec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r-- | libavformat/mlvdec.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/mlvdec.c b/libavformat/mlvdec.c index 998bf42dd6..6a3aa15a4e 100644 --- a/libavformat/mlvdec.c +++ b/libavformat/mlvdec.c @@ -52,8 +52,6 @@ typedef struct { uint64_t pts; } MlvContext; -static int read_close(AVFormatContext *s); - static int probe(const AVProbeData *p) { if (AV_RL32(p->buf) == MKTAG('M','L','V','I') && @@ -380,7 +378,6 @@ static int read_header(AVFormatContext *avctx) if ((vst && !vst->internal->nb_index_entries) || (ast && !ast->internal->nb_index_entries)) { av_log(avctx, AV_LOG_ERROR, "no index entries found\n"); - read_close(avctx); return AVERROR_INVALIDDATA; } @@ -485,6 +482,7 @@ const AVInputFormat ff_mlv_demuxer = { .name = "mlv", .long_name = NULL_IF_CONFIG_SMALL("Magic Lantern Video (MLV)"), .priv_data_size = sizeof(MlvContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = probe, .read_header = read_header, .read_packet = read_packet, |