diff mbox series

[FFmpeg-devel,24/54] avformat/mlvdec: Simplify cleanup after read_header failure

Message ID HE1PR0301MB2154B5BFED57582089749C2C8F309@HE1PR0301MB2154.eurprd03.prod.outlook.com
State Accepted
Commit cc768bf7e44d8d98a9b42dff47cb9deff23050d4
Headers show
Series [FFmpeg-devel,01/54] avformat: Add internal flags for AV(In|Out)putFormat | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt June 15, 2021, 11:32 p.m. UTC 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/mlvdec.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
diff mbox series

Patch

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,