apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-11-01 13:03:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Rostislav Pehlivanov
2018-01-13 18:03:42 +00:00
parent c7d726f7f4
commit 56e11ebf55
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/dcaenc.c
View File

@@ -295,11 +295,10 @@ static int encode_init(AVCodecContext *avctx)
static av_cold int encode_close(AVCodecContext *avctx) static av_cold int encode_close(AVCodecContext *avctx)
{ {
if (avctx->priv_data) { DCAEncContext *c = avctx->priv_data;
DCAEncContext *c = avctx->priv_data; subband_bufer_free(c);
subband_bufer_free(c); ff_dcaadpcm_free(&c->adpcm_ctx);
ff_dcaadpcm_free(&c->adpcm_ctx);
}
return 0; return 0;
} }
@@ -1287,6 +1286,7 @@ AVCodec ff_dca_encoder = {
.close = encode_close, .close = encode_close,
.encode2 = encode_frame, .encode2 = encode_frame,
.capabilities = AV_CODEC_CAP_EXPERIMENTAL, .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, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S32,
AV_SAMPLE_FMT_NONE }, AV_SAMPLE_FMT_NONE },
.supported_samplerates = sample_rates, .supported_samplerates = sample_rates,