summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2020-03-21 18:31:06 +0100
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2021-07-08 13:49:47 +0200
commit7ae7d936532924108872f1f6d90d9104603616be (patch)
tree0f08d3a616ac1d299561f722a4a1b60856f4c36e /libavformat
parent48de45ea59101b9ea2818bd62a628ec734e81b41 (diff)
avformat/samidec: 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')
-rw-r--r--libavformat/samidec.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index 8f97cb7331..c23335cf4d 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -115,8 +115,6 @@ static int sami_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &sami->q);
end:
- if (res < 0)
- ff_subtitles_queue_clean(&sami->q);
av_bprint_finalize(&buf, NULL);
return res;
}
@@ -146,6 +144,7 @@ const AVInputFormat ff_sami_demuxer = {
.name = "sami",
.long_name = NULL_IF_CONFIG_SMALL("SAMI subtitle format"),
.priv_data_size = sizeof(SAMIContext),
+ .flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = sami_probe,
.read_header = sami_read_header,
.read_packet = sami_read_packet,