diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2020-03-21 18:31:06 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-07 22:41:30 +0200 |
| commit | 7d0e70d3722bd72f0459544e7a1761ac11a691e2 (patch) | |
| tree | ca5f67e1c5a89bdbd541c84e8e42c992db28c7a5 /libavformat/lrcdec.c | |
| parent | 37a0fa55df43b770cb9917de20724c4458e9b8f2 (diff) | |
| download | ffmpeg-7d0e70d3722bd72f0459544e7a1761ac11a691e2.tar.gz | |
avformat/lrcdec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat/lrcdec.c')
| -rw-r--r-- | libavformat/lrcdec.c | 5 |
1 files 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, |