From: Rostislav Pehlivanov <atomnuker@gmail.com>
Date: Sat, 13 Jan 2018 18:03:42 +0000 (+0000)
Subject: dcaenc: cleanup on init failure and add a threadsafe init codec cap
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=56e11ebf55a5e51a8a7131d382c2020e35d34f42;p=ffmpeg

dcaenc: cleanup on init failure and add a threadsafe init codec cap

The encoder didn't clean up if a malloc failed during init.
It also doesn't need any external tables to be initialized on init.
Finally, it didn't need to check for whether avctx->priv_data exists during
uninit.

Signed-off-by: Rostislav Pehlivanov <atomnuker@gmail.com>
---

diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index dd601ffae00..7ba2346ef1f 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -295,11 +295,10 @@ static int encode_init(AVCodecContext *avctx)
 
 static av_cold int encode_close(AVCodecContext *avctx)
 {
-    if (avctx->priv_data) {
-        DCAEncContext *c = avctx->priv_data;
-        subband_bufer_free(c);
-        ff_dcaadpcm_free(&c->adpcm_ctx);
-    }
+    DCAEncContext *c = avctx->priv_data;
+    subband_bufer_free(c);
+    ff_dcaadpcm_free(&c->adpcm_ctx);
+
     return 0;
 }
 
@@ -1287,6 +1286,7 @@ AVCodec ff_dca_encoder = {
     .close                 = encode_close,
     .encode2               = encode_frame,
     .capabilities          = AV_CODEC_CAP_EXPERIMENTAL,
+    .caps_internal         = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
     .sample_fmts           = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32,
                                                             AV_SAMPLE_FMT_NONE },
     .supported_samplerates = sample_rates,