From 6124cbdcfaab134a066e67706c92c8f01b4e13ff Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Fri, 15 May 2020 23:25:59 +0800 Subject: [PATCH] avcodec/adpcmenc: Add FF_CODEC_CAP_INIT_CLEANUP then we can remove adpcm_encode_close() in adpcm_encode_init() if have failed. so the goto error lable will be unnecessary and can be removed later. Signed-off-by: Limin Wang --- libavcodec/adpcmenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 668939c778..1c8456126e 100644 --- a/libavcodec/adpcmenc.c +++ b/libavcodec/adpcmenc.c @@ -146,7 +146,6 @@ static av_cold int adpcm_encode_init(AVCodecContext *avctx) return 0; error: - adpcm_encode_close(avctx); return ret; } @@ -717,6 +716,7 @@ AVCodec ff_ ## name_ ## _encoder = { \ .encode2 = adpcm_encode_frame, \ .close = adpcm_encode_close, \ .sample_fmts = sample_fmts_, \ + .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, \ } ADPCM_ENCODER(AV_CODEC_ID_ADPCM_IMA_QT, adpcm_ima_qt, sample_fmts_p, "ADPCM IMA QuickTime");