X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fcngdec.c;h=57cb620179c2dbdc01070e7d1942d488c907a19b;hb=a247ac640df3da573cd661065bf53f37863e2b46;hp=28432ac7194b61880699e04639a6f8f650aed487;hpb=f4cf6ba8c9646814af842a99335c6ee312ded299;p=ffmpeg

diff --git a/libavcodec/cngdec.c b/libavcodec/cngdec.c
index 28432ac7194..57cb620179c 100644
--- a/libavcodec/cngdec.c
+++ b/libavcodec/cngdec.c
@@ -69,7 +69,6 @@ static av_cold int cng_decode_init(AVCodecContext *avctx)
     p->excitation       = av_mallocz_array(avctx->frame_size, sizeof(*p->excitation));
     if (!p->refl_coef || !p->target_refl_coef || !p->lpc_coef ||
         !p->filter_out || !p->excitation) {
-        cng_decode_close(avctx);
         return AVERROR(ENOMEM);
     }
 
@@ -162,7 +161,7 @@ static int cng_decode_frame(AVCodecContext *avctx, void *data,
     return buf_size;
 }
 
-AVCodec ff_comfortnoise_decoder = {
+const AVCodec ff_comfortnoise_decoder = {
     .name           = "comfortnoise",
     .long_name      = NULL_IF_CONFIG_SMALL("RFC 3389 comfort noise generator"),
     .type           = AVMEDIA_TYPE_AUDIO,
@@ -174,5 +173,7 @@ AVCodec ff_comfortnoise_decoder = {
     .close          = cng_decode_close,
     .sample_fmts    = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16,
                                                      AV_SAMPLE_FMT_NONE },
-    .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_DR1,
+    .capabilities   = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_CHANNEL_CONF,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
+                      FF_CODEC_CAP_INIT_CLEANUP,
 };