[FFmpeg-cvslog] avformat/mpl2dec: Simplify cleanup after read_header failure
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 16:44:49 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [3237d955e8ed82a8a2340a9e967417120548b076] | committer: Andreas Rheinhardt
avformat/mpl2dec: 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=3237d955e8ed82a8a2340a9e967417120548b076
---
libavformat/mpl2dec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c
index b99acff157..0beb9ca388 100644
--- a/libavformat/mpl2dec.c
+++ b/libavformat/mpl2dec.c
@@ -110,10 +110,8 @@ static int mpl2_read_header(AVFormatContext *s)
AVPacket *sub;
sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0);
- if (!sub) {
- ff_subtitles_queue_clean(&mpl2->q);
+ if (!sub)
return AVERROR(ENOMEM);
- }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = duration;
@@ -149,6 +147,7 @@ const AVInputFormat ff_mpl2_demuxer = {
.name = "mpl2",
.long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitles"),
.priv_data_size = sizeof(MPL2Context),
+ .flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = mpl2_probe,
.read_header = mpl2_read_header,
.read_packet = mpl2_read_packet,
More information about the ffmpeg-cvslog
mailing list