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

avformat/mpl2dec: 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 bcdc1d1060
commit 3237d955e8
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/mpl2dec.c
View File

@@ -110,10 +110,8 @@ static int mpl2_read_header(AVFormatContext *s)
AVPacket *sub; AVPacket *sub;
sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0); sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0);
if (!sub) { if (!sub)
ff_subtitles_queue_clean(&mpl2->q);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
sub->pos = pos; sub->pos = pos;
sub->pts = pts_start; sub->pts = pts_start;
sub->duration = duration; sub->duration = duration;
@@ -149,6 +147,7 @@ const AVInputFormat ff_mpl2_demuxer = {
.name = "mpl2", .name = "mpl2",
.long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitles"), .long_name = NULL_IF_CONFIG_SMALL("MPL2 subtitles"),
.priv_data_size = sizeof(MPL2Context), .priv_data_size = sizeof(MPL2Context),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = mpl2_probe, .read_probe = mpl2_probe,
.read_header = mpl2_read_header, .read_header = mpl2_read_header,
.read_packet = mpl2_read_packet, .read_packet = mpl2_read_packet,