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 14:24:01 +0200 |
| commit | 04aa4065d7050dbad553384f4699d0cf99b89b52 (patch) | |
| tree | c4ea0ea9cf17115429a79e86b80362ea7d071834 /libavformat/vplayerdec.c | |
| parent | 21e40af378106ce4f5a7c9b2d177913bd5c0f7b2 (diff) | |
| download | ffmpeg-04aa4065d7050dbad553384f4699d0cf99b89b52.tar.gz | |
avformat/vplayerdec: 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/vplayerdec.c')
| -rw-r--r-- | libavformat/vplayerdec.c | 5 |
1 files 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, |