[FFmpeg-cvslog] avformat/pjsdec: Simplify cleanup after read_header failure
Andreas Rheinhardt
git at videolan.org
Thu Jul 8 16:45:07 EEST 2021
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Sat Mar 21 18:31:06 2020 +0100| [ae123057a30143d8fb230bdd8eab7a9ae7d5733a] | committer: Andreas Rheinhardt
avformat/pjsdec: Simplify cleanup after read_header failure
by setting the FF_FMT_INIT_CLEANUP flag.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ae123057a30143d8fb230bdd8eab7a9ae7d5733a
---
libavformat/pjsdec.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libavformat/pjsdec.c b/libavformat/pjsdec.c
index 40d820a8d6..1fc16831ea 100644
--- a/libavformat/pjsdec.c
+++ b/libavformat/pjsdec.c
@@ -93,10 +93,8 @@ static int pjs_read_header(AVFormatContext *s)
p[strcspn(p, "\"")] = 0;
sub = ff_subtitles_queue_insert(&pjs->q, p, strlen(p), 0);
- if (!sub) {
- ff_subtitles_queue_clean(&pjs->q);
+ if (!sub)
return AVERROR(ENOMEM);
- }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = duration;
@@ -132,6 +130,7 @@ const AVInputFormat ff_pjs_demuxer = {
.name = "pjs",
.long_name = NULL_IF_CONFIG_SMALL("PJS (Phoenix Japanimation Society) subtitles"),
.priv_data_size = sizeof(PJSContext),
+ .flags_internal = FF_FMT_INIT_CLEANUP,
.read_probe = pjs_probe,
.read_header = pjs_read_header,
.read_packet = pjs_read_packet,
More information about the ffmpeg-cvslog
mailing list