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-07 22:14:50 +0200 |
| commit | 7556490b090b4bfb4f5c98c6a75a376c1c632dc6 (patch) | |
| tree | 808a4a6b8fed0e298f63ecb3bdf99d35c6082e40 /libavformat/jacosubdec.c | |
| parent | 7a1037b6bd4adf3fd3f382a0b2306048b2050a05 (diff) | |
avformat/jacosubdec: 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/jacosubdec.c')
| -rw-r--r-- | libavformat/jacosubdec.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavformat/jacosubdec.c b/libavformat/jacosubdec.c index c8bded02fe..510219224f 100644 --- a/libavformat/jacosubdec.c +++ b/libavformat/jacosubdec.c @@ -200,8 +200,7 @@ static int jacosub_read_header(AVFormatContext *s) sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line); if (!sub) { av_bprint_finalize(&header, NULL); - ret = AVERROR(ENOMEM); - goto fail; + return AVERROR(ENOMEM); } sub->pos = pos; merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); @@ -246,7 +245,7 @@ static int jacosub_read_header(AVFormatContext *s) /* general/essential directives in the extradata */ ret = ff_bprint_to_codecpar_extradata(st->codecpar, &header); if (ret < 0) - goto fail; + return ret; /* SHIFT and TIMERES affect the whole script so packet timing can only be * done in a second pass */ @@ -257,9 +256,6 @@ static int jacosub_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &jacosub->q); return 0; -fail: - jacosub_read_close(s); - return ret; } static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt) @@ -280,6 +276,7 @@ const AVInputFormat ff_jacosub_demuxer = { .name = "jacosub", .long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle format"), .priv_data_size = sizeof(JACOsubContext), + .flags_internal = FF_FMT_INIT_CLEANUP, .read_probe = jacosub_probe, .read_header = jacosub_read_header, .read_packet = jacosub_read_packet, |