diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2020-03-21 18:31:06 +0100 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2021-07-08 13:59:11 +0200 |
| commit | c6686388aab8cba1689b7ae743a6fc154414797c (patch) | |
| tree | 883f812de0d3c612e17f19bc0e682981f9b991a8 /libavformat | |
| parent | 511bd6af47c8dcc4139065e203de10eb5d40f39c (diff) | |
| download | ffmpeg-c6686388aab8cba1689b7ae743a6fc154414797c.tar.gz | |
avformat/stldec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/stldec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/stldec.c b/libavformat/stldec.c index 7b7c98577d..48e18d865e 100644 --- a/libavformat/stldec.c +++ b/libavformat/stldec.c @@ -97,10 +97,8 @@ static int stl_read_header(AVFormatContext *s) if (pts_start != AV_NOPTS_VALUE) { AVPacket *sub; sub = ff_subtitles_queue_insert(&stl->q, p, strlen(p), 0); - if (!sub) { - ff_subtitles_queue_clean(&stl->q); + if (!sub) return AVERROR(ENOMEM); - } sub->pos = pos; sub->pts = pts_start; sub->duration = duration; @@ -134,6 +132,7 @@ const AVInputFormat ff_stl_demuxer = { .name = "stl", .long_name = NULL_IF_CONFIG_SMALL("Spruce subtitle format"), .priv_data_size = sizeof(STLContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = stl_probe, .read_header = stl_read_header, .read_packet = stl_read_packet, |