diff options
Diffstat (limited to 'libavcodec/nellymoserdec.c')
| -rw-r--r-- | libavcodec/nellymoserdec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c index 2d59abf9a8..04d966173a 100644 --- a/libavcodec/nellymoserdec.c +++ b/libavcodec/nellymoserdec.c @@ -166,22 +166,22 @@ static int decode_tag(AVCodecContext * avctx, const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; NellyMoserDecodeContext *s = avctx->priv_data; + int data_max = *data_size; int blocks, i, block_size; int16_t *samples_s16 = data; float *samples_flt = data; + *data_size = 0; if (buf_size < avctx->block_align) { - *data_size = 0; return buf_size; } if (buf_size % NELLY_BLOCK_LEN) { av_log(avctx, AV_LOG_ERROR, "Tag size %d.\n", buf_size); - *data_size = 0; return buf_size; } block_size = NELLY_SAMPLES * av_get_bytes_per_sample(avctx->sample_fmt); - blocks = FFMIN(buf_size / NELLY_BLOCK_LEN, *data_size / block_size); + blocks = FFMIN(buf_size / NELLY_BLOCK_LEN, data_max / block_size); if (blocks <= 0) { av_log(avctx, AV_LOG_ERROR, "Output buffer is too small\n"); return AVERROR(EINVAL); |