Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avformat/assdec: Simplify cleanup after read_header failure

Browse Source 
by setting the FF_FMT_INIT_CLEANUP flag.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
pull/359/head
Andreas Rheinhardt 5 years ago
parent 0de329e8e8
commit ef7eaa4529
1 changed files with 1 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      libavformat/assdec.c

3
libavformat/assdec.c
Unescape View File

@ -160,8 +160,6 @@ static int ass_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &ass->q); ff_subtitles_queue_finalize(s, &ass->q);
end: end:
if (res < 0)
ass_read_close(s);
av_bprint_finalize(&header, NULL); av_bprint_finalize(&header, NULL);
av_bprint_finalize(&line, NULL); av_bprint_finalize(&line, NULL);
av_bprint_finalize(&rline, NULL); av_bprint_finalize(&rline, NULL);
@ -185,6 +183,7 @@ static int ass_read_seek(AVFormatContext *s, int stream_index,
const AVInputFormat ff_ass_demuxer = { const AVInputFormat ff_ass_demuxer = {
.name = "ass", .name = "ass",
.long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"), .long_name = NULL_IF_CONFIG_SMALL("SSA (SubStation Alpha) subtitle"),
.flags_internal = FF_FMT_INIT_CLEANUP,
.priv_data_size = sizeof(ASSContext), .priv_data_size = sizeof(ASSContext),
.read_probe = ass_probe, .read_probe = ass_probe,
.read_header = ass_read_header, .read_header = ass_read_header,

Write Preview
Loading…
Cancel
Save