diff mbox series

[FFmpeg-devel,20/54] avformat/lrcdec: Simplify cleanup after read_header failure

Message ID HE1PR0301MB2154B7E93218881EFA042B998F309@HE1PR0301MB2154.eurprd03.prod.outlook.com
State Accepted
Commit 7d0e70d3722bd72f0459544e7a1761ac11a691e2
Headers show
Series [FFmpeg-devel,01/54] avformat: Add internal flags for AV(In|Out)putFormat | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt June 15, 2021, 11:32 p.m. UTC 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavformat/lrcdec.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

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,