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:02:57 +0200 |
| commit | 480094b2a67bd261ea3034b899d2932273a44c6f (patch) | |
| tree | 3f8c18a31120724a057b911045fa6364a8ee9be2 | |
| parent | 43ac74a7d88b6659b332bceec85c7761ebb4e9fc (diff) | |
| download | ffmpeg-480094b2a67bd261ea3034b899d2932273a44c6f.tar.gz | |
avformat/subviewer1dec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
| -rw-r--r-- | libavformat/subviewer1dec.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/subviewer1dec.c b/libavformat/subviewer1dec.c index d1ba99f984..f1267031f8 100644 --- a/libavformat/subviewer1dec.c +++ b/libavformat/subviewer1dec.c @@ -77,10 +77,8 @@ static int subviewer1_read_header(AVFormatContext *s) sub->duration = pts_start - sub->pts; } else { sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0); - if (!sub) { - ff_subtitles_queue_clean(&subviewer1->q); + if (!sub) return AVERROR(ENOMEM); - } sub->pos = pos; sub->pts = pts_start; sub->duration = -1; @@ -117,6 +115,7 @@ const AVInputFormat ff_subviewer1_demuxer = { .name = "subviewer1", .long_name = NULL_IF_CONFIG_SMALL("SubViewer v1 subtitle format"), .priv_data_size = sizeof(SubViewer1Context), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = subviewer1_probe, .read_header = subviewer1_read_header, .read_packet = subviewer1_read_packet, |