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 13:24:32 +0200 |
| commit | ae123057a30143d8fb230bdd8eab7a9ae7d5733a (patch) | |
| tree | 32fff3aadef5e8a263dc5a0e78e6f0be99fa9e7d /libavformat/pjsdec.c | |
| parent | d2574262a538748a24ca2debecec33d8fe31df60 (diff) | |
| download | ffmpeg-ae123057a30143d8fb230bdd8eab7a9ae7d5733a.tar.gz | |
avformat/pjsdec: 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/pjsdec.c')
| -rw-r--r-- | libavformat/pjsdec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/pjsdec.c b/libavformat/pjsdec.c index 40d820a8d6..1fc16831ea 100644 --- a/libavformat/pjsdec.c +++ b/libavformat/pjsdec.c @@ -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, |