[FFmpeg-cvslog] avcodec/hcom: Cleanup generically upon init failure
Andreas Rheinhardt
git at videolan.org
Tue Sep 15 20:43:49 EEST 2020
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Sep 14 17:39:55 2020 +0200| [0bb5cc0ee959bdc2ff439a149343bc1a53998f31] | committer: Andreas Rheinhardt
avcodec/hcom: Cleanup generically upon init failure
Reviewed-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0bb5cc0ee959bdc2ff439a149343bc1a53998f31
---
libavcodec/hcom.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/libavcodec/hcom.c b/libavcodec/hcom.c
index 8300676f98..06fa25fcd2 100644
--- a/libavcodec/hcom.c
+++ b/libavcodec/hcom.c
@@ -67,15 +67,11 @@ static av_cold int hcom_init(AVCodecContext *avctx)
if (s->dict[i].l >= 0 &&
(s->dict[i].l >= s->dict_entries ||
s->dict[i].r >= s->dict_entries ||
- s->dict[i].r < 0 )) {
- av_freep(&s->dict);
+ s->dict[i].r < 0 ))
return AVERROR_INVALIDDATA;
- }
}
- if (s->dict[0].l < 0) {
- av_freep(&s->dict);
+ if (s->dict[0].l < 0)
return AVERROR_INVALIDDATA;
- }
avctx->sample_fmt = AV_SAMPLE_FMT_U8;
s->dict_entry = 0;
@@ -148,4 +144,5 @@ AVCodec ff_hcom_decoder = {
.close = hcom_close,
.decode = hcom_decode,
.capabilities = AV_CODEC_CAP_DR1,
+ .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};
More information about the ffmpeg-cvslog
mailing list