virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

avformat/subviewer1dec: 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 43ac74a7d8
commit 480094b2a6
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/subviewer1dec.c
View File

@@ -77,10 +77,8 @@ static int subviewer1_read_header(AVFormatContext *s)
sub->duration = pts_start - sub->pts; sub->duration = pts_start - sub->pts;
} else { } else {
sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0); sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0);
if (!sub) { if (!sub)
ff_subtitles_queue_clean(&subviewer1->q);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
sub->pos = pos; sub->pos = pos;
sub->pts = pts_start; sub->pts = pts_start;
sub->duration = -1; sub->duration = -1;
@@ -117,6 +115,7 @@ const AVInputFormat ff_subviewer1_demuxer = {
.name = "subviewer1", .name = "subviewer1",
.long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle format"),
.priv_data_size = sizeof(SubViewer1Context), .priv_data_size = sizeof(SubViewer1Context),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = subviewer1_probe, .read_probe = subviewer1_probe,
.read_header = subviewer1_read_header, .read_header = subviewer1_read_header,
.read_packet = subviewer1_read_packet, .read_packet = subviewer1_read_packet,