ffmpeg | branch: master | Andreas Rheinhardt <[email protected]> | Sat Mar 21 18:31:06 2020 +0100| [c6686388aab8cba1689b7ae743a6fc154414797c] | committer: Andreas Rheinhardt
avformat/stldec: Simplify cleanup after read_header failure by setting the FF_FMT_INIT_CLEANUP flag. Signed-off-by: Andreas Rheinhardt <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c6686388aab8cba1689b7ae743a6fc154414797c --- 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, _______________________________________________ ffmpeg-cvslog mailing list [email protected] https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email [email protected] with subject "unsubscribe".
