[FFmpeg-cvslog] avformat/vplayerdec: Simplify cleanup after read_header failure
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 16:45:39 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [04aa4065d7050dbad553384f4699d0cf99b89b52] | committer: Andreas Rheinhardt
avformat/vplayerdec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=04aa4065d7050dbad553384f4699d0cf99b89b52
---
libavformat/vplayerdec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/vplayerdec.c b/libavformat/vplayerdec.c
index f6c2b35ea7..8c9ff81163 100644
--- a/libavformat/vplayerdec.c
+++ b/libavformat/vplayerdec.c
@@ -83,10 +83,8 @@ static int vplayer_read_header(AVFormatContext *s)
AVPacket *sub;
sub = ff_subtitles_queue_insert(&vplayer->q, p, strlen(p), 0);
- if (!sub) {
- ff_subtitles_queue_clean(&vplayer->q);
+ if (!sub)
return AVERROR(ENOMEM);
- }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = -1;
@@ -122,6 +120,7 @@ const AVInputFormat ff_vplayer_demuxer = {
.name = "vplayer",
.long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitles"),
.priv_data_size = sizeof(VPlayerContext),
+ .flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = vplayer_probe,
.read_header = vplayer_read_header,
.read_packet = vplayer_read_packet,
More information about the ffmpeg-cvslog
mailing list