[FFmpeg-cvslog] avformat/assdec: Simplify cleanup after read_header failure

Andreas Rheinhardt git at videolan.org
Thu Jul 8 16:44:12 EEST 2021


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [ef7eaa4529b2c536bf0682f05508b98114795ac1] | committer: Andreas Rheinhardt

avformat/assdec: Simplify cleanup after read_header failure

by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ef7eaa4529b2c536bf0682f05508b98114795ac1
---

 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,



More information about the ffmpeg-cvslog mailing list