From 43ac74a7d88b6659b332bceec85c7761ebb4e9fc Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 21 Mar 2020 18:31:06 +0100 Subject: [PATCH] avformat/subviewerdec: Simplify cleanup after read_header failure by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/subviewerdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c index 9bb7728407cfb..2ef3c088eb7e7 100644 --- a/libavformat/subviewerdec.c +++ b/libavformat/subviewerdec.c @@ -176,8 +176,6 @@ static int subviewer_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &subviewer->q); end: - if (res < 0) - ff_subtitles_queue_clean(&subviewer->q); av_bprint_finalize(&header, NULL); return res; } @@ -207,6 +205,7 @@ const AVInputFormat ff_subviewer_demuxer = { .name = "subviewer", .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle format"), .priv_data_size = sizeof(SubViewerContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = subviewer_probe, .read_header = subviewer_read_header, .read_packet = subviewer_read_packet,