Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

avformat/mpeg: Simplify cleanup after reading vobsub header fails

Browse source 
by setting the FF_FMT_INIT_CLEANUP flag. Furthermore, also remove
an unnecessary check for NULL before avformat_close_input().

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2020-03-21 21:03:44 +01:00
parent c6e9672b50
commit bcdc1d1060
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libavformat/mpeg.c
View file

@ -723,8 +723,7 @@ static int vobsub_read_close(AVFormatContext *s)
for (i = 0; i < s->nb_streams; i++) for (i = 0; i < s->nb_streams; i++)
ff_subtitles_queue_clean(&vobsub->q[i]); ff_subtitles_queue_clean(&vobsub->q[i]);
if (vobsub->sub_ctx) avformat_close_input(&vobsub->sub_ctx);
avformat_close_input(&vobsub->sub_ctx);
return 0; return 0;
} }
@ -768,17 +767,17 @@ static int vobsub_read_header(AVFormatContext *s)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
av_bprint_init(&header, 0, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
if ((ret = ff_copy_whiteblacklists(vobsub->sub_ctx, s)) < 0) if ((ret = ff_copy_whiteblacklists(vobsub->sub_ctx, s)) < 0)
goto end; return ret;
ret = avformat_open_input(&vobsub->sub_ctx, vobsub->sub_name, iformat, NULL); ret = avformat_open_input(&vobsub->sub_ctx, vobsub->sub_name, iformat, NULL);
if (ret < 0) { if (ret < 0) {
av_log(s, AV_LOG_ERROR, "Unable to open %s as MPEG subtitles\n", vobsub->sub_name); av_log(s, AV_LOG_ERROR, "Unable to open %s as MPEG subtitles\n", vobsub->sub_name);
goto end; return ret;
} }
av_bprint_init(&header, 0, INT_MAX - AV_INPUT_BUFFER_PADDING_SIZE);
while (!avio_feof(s->pb)) { while (!avio_feof(s->pb)) {
char line[MAX_LINE_SIZE]; char line[MAX_LINE_SIZE];
int len = ff_get_line(s->pb, line, sizeof(line)); int len = ff_get_line(s->pb, line, sizeof(line));
@ -911,8 +910,6 @@ static int vobsub_read_header(AVFormatContext *s)
memcpy(par->extradata, header.str, header.len); memcpy(par->extradata, header.str, header.len);
} }
end: end:
if (ret < 0)
vobsub_read_close(s);
av_bprint_finalize(&header, NULL); av_bprint_finalize(&header, NULL);
return ret; return ret;
} }
@ -1044,6 +1041,7 @@ const AVInputFormat ff_vobsub_demuxer = {
.name = "vobsub", .name = "vobsub",
.long_name = NULL_IF_CONFIG_SMALL("VobSub subtitle format"), .long_name = NULL_IF_CONFIG_SMALL("VobSub subtitle format"),
.priv_data_size = sizeof(VobSubDemuxContext), .priv_data_size = sizeof(VobSubDemuxContext),
.flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = vobsub_probe, .read_probe = vobsub_probe,
.read_header = vobsub_read_header, .read_header = vobsub_read_header,
.read_packet = vobsub_read_packet, .read_packet = vobsub_read_packet,