diff options
Diffstat (limited to 'libavcodec/adxdec.c')
| -rw-r--r-- | libavcodec/adxdec.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 14fddf5520..5115cede6a 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -2,20 +2,20 @@ * ADX ADPCM codecs * Copyright (c) 2001,2003 BERO * - * This file is part of Libav. + * This file is part of FFmpeg. * - * Libav is free software; you can redistribute it and/or + * FFmpeg is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) any later version. * - * Libav is distributed in the hope that it will be useful, + * FFmpeg is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with Libav; if not, write to the Free Software + * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ @@ -101,6 +101,7 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, int16_t **samples; int samples_offset; const uint8_t *buf = avpkt->data; + const uint8_t *buf_end = buf + avpkt->size; int num_blocks, ch, ret; if (c->eof) { @@ -141,16 +142,14 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, /* get output buffer */ frame->nb_samples = num_blocks * BLOCK_SAMPLES; - if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) { - av_log(avctx, AV_LOG_ERROR, "get_buffer() failed\n"); + if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - } samples = (int16_t **)frame->extended_data; samples_offset = 0; while (num_blocks--) { for (ch = 0; ch < c->channels; ch++) { - if (adx_decode(c, samples[ch], samples_offset, buf, ch)) { + if (buf_end - buf < BLOCK_SIZE || adx_decode(c, samples[ch], samples_offset, buf, ch)) { c->eof = 1; buf = avpkt->data + avpkt->size; break; @@ -158,9 +157,11 @@ static int adx_decode_frame(AVCodecContext *avctx, void *data, buf_size -= BLOCK_SIZE; buf += BLOCK_SIZE; } - samples_offset += BLOCK_SAMPLES; + if (!c->eof) + samples_offset += BLOCK_SAMPLES; } + frame->nb_samples = samples_offset; *got_frame_ptr = 1; return buf - avpkt->data; |