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

Andreas Rheinhardt git at videolan.org
Thu Jul 8 16:45:23 EEST 2021


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

avformat/srtdec: 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=511bd6af47c8dcc4139065e203de10eb5d40f39c
---

 libavformat/srtdec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index fa52b85566..2f8a677b9f 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -207,8 +207,6 @@ static int srt_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(s, &srt->q);
 
 end:
-    if (res < 0)
-        ff_subtitles_queue_clean(&srt->q);
     av_bprint_finalize(&buf, NULL);
     return res;
 }
@@ -238,6 +236,7 @@ const AVInputFormat ff_srt_demuxer = {
     .name        = "srt",
     .long_name   = NULL_IF_CONFIG_SMALL("SubRip subtitle"),
     .priv_data_size = sizeof(SRTContext),
+    .flags_internal = FF_FMT_INIT_CLEANUP,
     .read_probe  = srt_probe,
     .read_header = srt_read_header,
     .read_packet = srt_read_packet,



More information about the ffmpeg-cvslog mailing list