MrBesen
/
ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avformat/mccdec: Simplify cleanup after read_header failure 

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 d32a403102
commit d18eee412a
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/mccdec.c
View File

@ -188,7 +188,7 @@ static int mcc_read_header(AVFormatContext *s)
continue;
sub = ff_subtitles_queue_insert(&mcc->q, out + start, count, 0);
if (!sub)
goto fail;
return AVERROR(ENOMEM);
sub->pos = pos;
sub->pts = ts;
@ -198,9 +198,6 @@ static int mcc_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &mcc->q);
return ret;
fail:
ff_subtitles_queue_clean(&mcc->q);
return AVERROR(ENOMEM);
}
static int mcc_read_packet(AVFormatContext *s, AVPacket *pkt)
@ -228,6 +225,7 @@ const AVInputFormat ff_mcc_demuxer = {
.name = "mcc",
.long_name = NULL_IF_CONFIG_SMALL("MacCaption"),
.priv_data_size = sizeof(MCCContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = mcc_probe,
.read_header = mcc_read_header,
.read_packet = mcc_read_packet,