Commit d716edd0 authored by michael's avatar michael

dont check buffer size if the decode function wont be called at all


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@8090 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent f1c3da33
......@@ -894,6 +894,7 @@ int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
{
int ret;
if((avctx->codec->capabilities & CODEC_CAP_DELAY) || buf_size){
//FIXME remove the check below _after_ ensuring that all audio check that the available space is enough
if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){
av_log(avctx, AV_LOG_ERROR, "buffer smaller than AVCODEC_MAX_AUDIO_FRAME_SIZE\n");
......@@ -905,7 +906,7 @@ int avcodec_decode_audio2(AVCodecContext *avctx, int16_t *samples,
av_log(avctx, AV_LOG_ERROR, "buffer %d too small\n", *frame_size_ptr);
return -1;
}
if((avctx->codec->capabilities & CODEC_CAP_DELAY) || buf_size){
ret = avctx->codec->decode(avctx, samples, frame_size_ptr,
buf, buf_size);
avctx->frame_number++;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment