[FFmpeg-cvslog] avformat/mpsubdec: Simplify cleanup after read_header failure
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 16:44:51 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [9821217a4f482c98fcf237ed2bfc2b5f8c83a5b5] | committer: Andreas Rheinhardt
avformat/mpsubdec: 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=9821217a4f482c98fcf237ed2bfc2b5f8c83a5b5
---
libavformat/mpsubdec.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c
index ee53be17d6..abf0e7fb9a 100644
--- a/libavformat/mpsubdec.c
+++ b/libavformat/mpsubdec.c
@@ -165,9 +165,6 @@ static int mpsub_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &mpsub->q);
end:
- if (res < 0)
- ff_subtitles_queue_clean(&mpsub->q);
-
av_bprint_finalize(&buf, NULL);
return res;
}
@@ -197,6 +194,7 @@ const AVInputFormat ff_mpsub_demuxer = {
.name = "mpsub",
.long_name = NULL_IF_CONFIG_SMALL("MPlayer subtitles"),
.priv_data_size = sizeof(MPSubContext),
+ .flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = mpsub_probe,
.read_header = mpsub_read_header,
.read_packet = mpsub_read_packet,
More information about the ffmpeg-cvslog
mailing list