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

3
libavformat/subviewerdec.c
View File

@@ -176,8 +176,6 @@ static int subviewer_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &subviewer->q); ff_subtitles_queue_finalize(s, &subviewer->q);
end: end:
if (res < 0)
ff_subtitles_queue_clean(&subviewer->q);
av_bprint_finalize(&header, NULL); av_bprint_finalize(&header, NULL);
return res; return res;
} }
@@ -207,6 +205,7 @@ const AVInputFormat ff_subviewer_demuxer = {
.name = "subviewer", .name = "subviewer",
.long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("SubViewer subtitle format"),
.priv_data_size = sizeof(SubViewerContext), .priv_data_size = sizeof(SubViewerContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = subviewer_probe, .read_probe = subviewer_probe,
.read_header = subviewer_read_header, .read_header = subviewer_read_header,
.read_packet = subviewer_read_packet, .read_packet = subviewer_read_packet,