From 3c7ca68eeb8f121988a2fe8f36b1bae10e0c3ea1 Mon Sep 17 00:00:00 2001 From: Andreas Rheinhardt Date: Sat, 29 Aug 2020 08:26:03 +0200 Subject: [PATCH] avcodec/eacmv: Cleanup generically after init failure Reviewed-by: Paul B Mahol Signed-off-by: Andreas Rheinhardt --- libavcodec/eacmv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c index 6f39d72b88..b239acffda 100644 --- a/libavcodec/eacmv.c +++ b/libavcodec/eacmv.c @@ -50,11 +50,8 @@ static av_cold int cmv_decode_init(AVCodecContext *avctx){ s->last_frame = av_frame_alloc(); s->last2_frame = av_frame_alloc(); - if (!s->last_frame || !s->last2_frame) { - av_frame_free(&s->last_frame); - av_frame_free(&s->last2_frame); + if (!s->last_frame || !s->last2_frame) return AVERROR(ENOMEM); - } return 0; } @@ -243,4 +240,5 @@ AVCodec ff_eacmv_decoder = { .close = cmv_decode_end, .decode = cmv_decode_frame, .capabilities = AV_CODEC_CAP_DR1, + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, };