From f545155eb3e6c9fb93548e0233076f2e333e3bec Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 21 Mar 2020 18:31:06 +0100 Subject: [PATCH] avformat/webvttdec: Simplify cleanup after read_header failure by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/webvttdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c index a4654034ac..52320ba7d1 100644 --- a/libavformat/webvttdec.c +++ b/libavformat/webvttdec.c @@ -164,8 +164,6 @@ static int webvtt_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &webvtt->q); end: - if (res < 0) - ff_subtitles_queue_clean(&webvtt->q); av_bprint_finalize(&cue, NULL); return res; } @@ -214,6 +212,7 @@ const AVInputFormat ff_webvtt_demuxer = { .name = "webvtt", .long_name = NULL_IF_CONFIG_SMALL("WebVTT subtitle"), .priv_data_size = sizeof(WebVTTContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = webvtt_probe, .read_header = webvtt_read_header, .read_packet = webvtt_read_packet,