virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avformat/pjsdec: 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 d2574262a5
commit ae123057a3
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/pjsdec.c
View File

@ -93,10 +93,8 @@ static int pjs_read_header(AVFormatContext *s)
p[strcspn(p, "\"")] = 0;
sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0);
if (!sub) {
ff_subtitles_queue_clean(&pjs->q);
if (!sub)
return AVERROR(ENOMEM);
}
sub->pos = pos;
sub->pts = pts_start;
sub->duration = duration;
@ -132,6 +130,7 @@ const AVInputFormat ff_pjs_demuxer = {
.name = "pjs",
.long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitles"),
.priv_data_size = sizeof(PJSContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = pjs_probe,
.read_header = pjs_read_header,
.read_packet = pjs_read_packet,