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/stldec: 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 511bd6af47
commit c6686388aa
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/stldec.c
View File

@@ -97,10 +97,8 @@ static int stl_read_header(AVFormatContext *s)
if (pts_start != AV_NOPTS_VALUE) { if (pts_start != AV_NOPTS_VALUE) {
AVPacket *sub; AVPacket *sub;
sub = ff_subtitles_queue_insert(&stl->q, p, strlen(p), 0); sub = ff_subtitles_queue_insert(&stl->q, p, strlen(p), 0);
if (!sub) { if (!sub)
ff_subtitles_queue_clean(&stl->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;
@@ -134,6 +132,7 @@ const AVInputFormat ff_stl_demuxer = {
.name = "stl", .name = "stl",
.long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"),
.priv_data_size = sizeof(STLContext), .priv_data_size = sizeof(STLContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = stl_probe, .read_probe = stl_probe,
.read_header = stl_read_header, .read_header = stl_read_header,
.read_packet = stl_read_packet, .read_packet = stl_read_packet,