From ef7eaa4529b2c536bf0682f05508b98114795ac1 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 21 Mar 2020 18:31:06 +0100 Subject: avformat/assdec: Simplify cleanup after read_header failure by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt --- libavformat/assdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/assdec.c b/libavformat/assdec.c index 4a9650fe76..5f71fcb024 100644 --- a/libavformat/assdec.c +++ b/libavformat/assdec.c @@ -160,8 +160,6 @@ static int ass_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &ass->q); end: - if (res < 0) - ass_read_close(s); av_bprint_finalize(&header, NULL); av_bprint_finalize(&line, NULL); av_bprint_finalize(&rline, NULL); @@ -185,6 +183,7 @@ static int ass_read_seek(AVFormatContext *s, int stream_index, const AVInputFormat ff_ass_demuxer = { .name = "ass", .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), + .flags_internal = FF_FMT_INIT_CLEANUP, .priv_data_size = sizeof(ASSContext), .read_probe = ass_probe, .read_header = ass_read_header, -- cgit v1.2.3