[FFmpeg-cvslog] avformat/lrcdec: Simplify cleanup after read_header failure
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 16:44:34 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [7d0e70d3722bd72f0459544e7a1761ac11a691e2] | committer: Andreas Rheinhardt
avformat/lrcdec: 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=7d0e70d3722bd72f0459544e7a1761ac11a691e2
---
libavformat/lrcdec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/lrcdec.c b/libavformat/lrcdec.c
index 678b618498..309014d630 100644
--- a/libavformat/lrcdec.c
+++ b/libavformat/lrcdec.c
@@ -204,10 +204,8 @@ static int lrc_read_header(AVFormatContext *s)
ts_stroffset += ts_stroffset_incr;
sub = ff_subtitles_queue_insert(&lrc->q, line.str + ts_strlength,
line.len - ts_strlength, 0);
- if(!sub) {
- ff_subtitles_queue_clean(&lrc->q);
+ if (!sub)
return AVERROR(ENOMEM);
- }
sub->pos = pos;
sub->pts = ts_start - lrc->ts_offset;
sub->duration = -1;
@@ -245,6 +243,7 @@ const AVInputFormat ff_lrc_demuxer = {
.name = "lrc",
.long_name = NULL_IF_CONFIG_SMALL("LRC lyrics"),
.priv_data_size = sizeof (LRCContext),
+ .flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = lrc_probe,
.read_header = lrc_read_header,
.read_packet = lrc_read_packet,
More information about the ffmpeg-cvslog
mailing list