[FFmpeg-devel] [PATCH 44/54] avformat/stldec: Simplify cleanup after read_header failure
Andreas Rheinhardt
andreas.rheinhardt at outlook.com
Wed Jun 16 02:32:33 EEST 2021
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
---
libavformat/stldec.c | 5 ++---
1 file 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,
--
2.27.0
More information about the ffmpeg-devel
mailing list