From: Limin Wang Date: Fri, 15 May 2020 15:25:59 +0000 (+0800) Subject: avcodec/adpcmenc: Add FF_CODEC_CAP_INIT_CLEANUP X-Git-Tag: n4.4-dev~118 X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/6124cbdcfaab134a066e67706c92c8f01b4e13ff 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 --- diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c index 668939c..1c84561 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");