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

nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.

This commit is contained in:
Justin Ruggles 2011-09-14 12:27:12 -04:00
parent 84464b2e7f
commit ded0800d44
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/nellymoserdec.c
View File

@ -170,13 +170,13 @@ static int decode_tag(AVCodecContext * avctx,
return buf_size; return buf_size;
} }
if (buf_size % 64) { if (buf_size % NELLY_BLOCK_LEN) {
av_log(avctx, AV_LOG_ERROR, "Tag size %d.\n", buf_size); av_log(avctx, AV_LOG_ERROR, "Tag size %d.\n", buf_size);
*data_size = 0; *data_size = 0;
return buf_size; return buf_size;
} }
block_size = NELLY_SAMPLES * av_get_bytes_per_sample(avctx->sample_fmt); block_size = NELLY_SAMPLES * av_get_bytes_per_sample(avctx->sample_fmt);
blocks = FFMIN(buf_size / 64, *data_size / block_size); blocks = FFMIN(buf_size / NELLY_BLOCK_LEN, *data_size / block_size);
if (blocks <= 0) { if (blocks <= 0) {
av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n"); av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n");
return AVERROR(EINVAL); return AVERROR(EINVAL);