[FFmpeg-cvslog] avcodec/cngenc: Cleanup generically after init failure

Andreas Rheinhardt git at videolan.org
Fri Sep 18 04:10:35 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Mon Sep 14 02:00:11 2020 +0200| [2fd3ada931ca1580096704541e2ed55d1d8b9e10] | committer: Andreas Rheinhardt

avcodec/cngenc: Cleanup generically after init failure

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2fd3ada931ca1580096704541e2ed55d1d8b9e10
---

 libavcodec/cngenc.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/cngenc.c b/libavcodec/cngenc.c
index 8f23b7555a..b622d7bbda 100644
--- a/libavcodec/cngenc.c
+++ b/libavcodec/cngenc.c
@@ -58,10 +58,8 @@ static av_cold int cng_encode_init(AVCodecContext *avctx)
         return ret;
     p->samples32 = av_malloc_array(avctx->frame_size, sizeof(*p->samples32));
     p->ref_coef = av_malloc_array(p->order, sizeof(*p->ref_coef));
-    if (!p->samples32 || !p->ref_coef) {
-        cng_encode_close(avctx);
+    if (!p->samples32 || !p->ref_coef)
         return AVERROR(ENOMEM);
-    }
 
     return 0;
 }
@@ -113,4 +111,5 @@ AVCodec ff_comfortnoise_encoder = {
     .close          = cng_encode_close,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
+    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
 };



More information about the ffmpeg-cvslog mailing list