RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-03-01 02:00:50 +00:00
Code Issues Projects Releases Wiki Activity

mace: only calculate output buffer size once

Browse Source
This commit is contained in:
Justin Ruggles 2011-10-28 21:27:36 -04:00
parent ce33320b30
commit f50b6be57d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/mace.c
View File

@ -243,11 +243,14 @@ static int mace_decode_frame(AVCodecContext *avctx,
int16_t *samples = data; int16_t *samples = data;
MACEContext *ctx = avctx->priv_data; MACEContext *ctx = avctx->priv_data;
int i, j, k, l; int i, j, k, l;
int out_size;
int is_mace3 = (avctx->codec_id == CODEC_ID_MACE3); int is_mace3 = (avctx->codec_id == CODEC_ID_MACE3);
if (*data_size < (3 * buf_size << (2-is_mace3))) { out_size = 3 * (buf_size << (1 - is_mace3)) *
av_log(avctx, AV_LOG_ERROR, "Output buffer too small!\n"); av_get_bytes_per_sample(avctx->sample_fmt);
return -1; if (*data_size < out_size) {
av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
return AVERROR(EINVAL);
} }
for(i = 0; i < avctx->channels; i++) { for(i = 0; i < avctx->channels; i++) {
@ -274,7 +277,7 @@ static int mace_decode_frame(AVCodecContext *avctx,
} }
} }
*data_size = 3 * buf_size << (2-is_mace3); *data_size = out_size;
return buf_size; return buf_size;
} }