highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avformat/vplayerdec: Simplify cleanup after read_header failure

Browse Source 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 18:31:06 +01:00
parent 21e40af378
commit 04aa4065d7
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavformat/vplayerdec.c
View File

@ -83,10 +83,8 @@ static int vplayer_read_header(AVFormatContext *s)
AVPacket *sub; AVPacket *sub;
sub = ff_subtitles_queue_insert(&vplayer->q, p, strlen(p), 0); sub = ff_subtitles_queue_insert(&vplayer->q, p, strlen(p), 0);
if (!sub) { if (!sub)
ff_subtitles_queue_clean(&vplayer->q);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
}
sub->pos = pos; sub->pos = pos;
sub->pts = pts_start; sub->pts = pts_start;
sub->duration = -1; sub->duration = -1;
@ -122,6 +120,7 @@ const AVInputFormat ff_vplayer_demuxer = {
.name = "vplayer", .name = "vplayer",
.long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitles"), .long_name = NULL_IF_CONFIG_SMALL("VPlayer subtitles"),
.priv_data_size = sizeof(VPlayerContext), .priv_data_size = sizeof(VPlayerContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = vplayer_probe, .read_probe = vplayer_probe,
.read_header = vplayer_read_header, .read_header = vplayer_read_header,
.read_packet = vplayer_read_packet, .read_packet = vplayer_read_packet,