videolan
/
ffmpeg
mirror of https://git.videolan.org/git/ffmpeg.git
1
Fork 0
Code Releases Activity

avcodec/g722enc: Cleanup generically on init failure 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
(cherry picked from commit 23daf8e67f)
This commit is contained in:
Andreas Rheinhardt 2020-09-14 17:21:12 +02:00
parent 45d9887751
commit a8bd30a48e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/g722enc.c
View File

@ -59,7 +59,6 @@ static av_cold int g722_encode_close(AVCodecContext *avctx)
static av_cold int g722_encode_init(AVCodecContext * avctx)
{
G722Context *c = avctx->priv_data;
int ret;
c->band[0].scale_factor = 8;
c->band[1].scale_factor = 2;
@ -73,10 +72,8 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
c->paths[i] = av_mallocz_array(max_paths, sizeof(**c->paths));
c->node_buf[i] = av_mallocz_array(frontier, 2 * sizeof(**c->node_buf));
c->nodep_buf[i] = av_mallocz_array(frontier, 2 * sizeof(**c->nodep_buf));
if (!c->paths[i] || !c->node_buf[i] || !c->nodep_buf[i]) {
ret = AVERROR(ENOMEM);
goto error;
}
if (!c->paths[i] || !c->node_buf[i] || !c->nodep_buf[i])
return AVERROR(ENOMEM);
}
}
@ -118,9 +115,6 @@ static av_cold int g722_encode_init(AVCodecContext * avctx)
ff_g722dsp_init(&c->dsp);
return 0;
error:
g722_encode_close(avctx);
return ret;
}
static const int16_t low_quant[33] = {
@ -387,4 +381,5 @@ AVCodec ff_adpcm_g722_encoder = {
.capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME,
.sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_S16, AV_SAMPLE_FMT_NONE },
.channel_layouts = (const uint64_t[]){ AV_CH_LAYOUT_MONO, 0 },
.caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
};