RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 18:31:06 +01:00
parent 7a1037b6bd
commit 7556490b09
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/jacosubdec.c
View File

@ -200,8 +200,7 @@ static int jacosub_read_header(AVFormatContext *s)
sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line); sub = ff_subtitles_queue_insert(&jacosub->q, line, len, merge_line);
if (!sub) { if (!sub) {
av_bprint_finalize(&header, NULL); av_bprint_finalize(&header, NULL);
ret = AVERROR(ENOMEM); return AVERROR(ENOMEM);
goto fail;
} }
sub->pos = pos; sub->pos = pos;
merge_line = len > 1 && !strcmp(&line[len - 2], "\\\n"); 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 */ /* general/essential directives in the extradata */
ret = ff_bprint_to_codecpar_extradata(st->codecpar, &header); ret = ff_bprint_to_codecpar_extradata(st->codecpar, &header);
if (ret < 0) if (ret < 0)
goto fail; return ret;
/* SHIFT and TIMERES affect the whole script so packet timing can only be /* SHIFT and TIMERES affect the whole script so packet timing can only be
* done in a second pass */ * done in a second pass */
@ -257,9 +256,6 @@ static int jacosub_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &jacosub->q); ff_subtitles_queue_finalize(s, &jacosub->q);
return 0; return 0;
fail:
jacosub_read_close(s);
return ret;
} }
static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt) static int jacosub_read_packet(AVFormatContext *s, AVPacket *pkt)
@ -280,6 +276,7 @@ const AVInputFormat ff_jacosub_demuxer = {
.name = "jacosub", .name = "jacosub",
.long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("JACOsub subtitle format"),
.priv_data_size = sizeof(JACOsubContext), .priv_data_size = sizeof(JACOsubContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = jacosub_probe, .read_probe = jacosub_probe,
.read_header = jacosub_read_header, .read_header = jacosub_read_header,
.read_packet = jacosub_read_packet, .read_packet = jacosub_read_packet,