[FFmpeg-devel] [PATCH 1/3] avcodec/adpcmenc: Add FF_CODEC_CAP_INIT_CLEANUP

lance.lmwang at gmail.com lance.lmwang at gmail.com
Mon May 18 14:11:07 EEST 2020


From: Limin Wang <lance.lmwang at gmail.com>

then we can remove adpcm_encode_close() in adpcm_encode_init() if have failed.
so the goto error lable wlll be unnecessary and can be removed later. 

Signed-off-by: Limin Wang <lance.lmwang at gmail.com>
---
 libavcodec/adpcmenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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");
-- 
2.6.4



More information about the ffmpeg-devel mailing list