RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/twinvq: Use FF_ALLOC_ARRAY_OR_GOTO() 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-09-10 20:44:19 +02:00
parent c4a0c64f14
commit 6f48c60956
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libavcodec/twinvq.c
View File

@ -546,24 +546,24 @@ static av_cold int init_mdct_win(TwinVQContext *tctx)
return ret; return ret;
} }
FF_ALLOC_OR_GOTO(tctx->avctx, tctx->tmp_buf, FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->tmp_buf,
mtab->size * sizeof(*tctx->tmp_buf), alloc_fail); mtab->size, sizeof(*tctx->tmp_buf), alloc_fail);
FF_ALLOC_OR_GOTO(tctx->avctx, tctx->spectrum, FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->spectrum,
2 * mtab->size * channels * sizeof(*tctx->spectrum), 2 * mtab->size, channels * sizeof(*tctx->spectrum),
alloc_fail); alloc_fail);
FF_ALLOC_OR_GOTO(tctx->avctx, tctx->curr_frame, FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->curr_frame,
2 * mtab->size * channels * sizeof(*tctx->curr_frame), 2 * mtab->size, channels * sizeof(*tctx->curr_frame),
alloc_fail); alloc_fail);
FF_ALLOC_OR_GOTO(tctx->avctx, tctx->prev_frame, FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->prev_frame,
2 * mtab->size * channels * sizeof(*tctx->prev_frame), 2 * mtab->size, channels * sizeof(*tctx->prev_frame),
alloc_fail); alloc_fail);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {
int m = 4 * mtab->size / mtab->fmode[i].sub; int m = 4 * mtab->size / mtab->fmode[i].sub;
double freq = 2 * M_PI / m; double freq = 2 * M_PI / m;
FF_ALLOC_OR_GOTO(tctx->avctx, tctx->cos_tabs[i], FF_ALLOC_ARRAY_OR_GOTO(tctx->avctx, tctx->cos_tabs[i],
(m / 4) * sizeof(*tctx->cos_tabs[i]), alloc_fail); (m / 4), sizeof(*tctx->cos_tabs[i]), alloc_fail);
for (j = 0; j <= m / 8; j++) for (j = 0; j <= m / 8; j++)
tctx->cos_tabs[i][j] = cos((2 * j + 1) * freq); tctx->cos_tabs[i][j] = cos((2 * j + 1) * freq);