virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-02-04 06:08:26 +02:00
Code Issues Releases Activity

avformat/lrcdec: Simplify cleanup after read_header failure

Browse Source 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 18:31:06 +01:00
parent 37a0fa55df
commit 7d0e70d372
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/lrcdec.c
View File

@ -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,