aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Shishkov <kostya.shishkov@gmail.com>2007-09-24 16:50:32 +0000
committerKostya Shishkov <kostya.shishkov@gmail.com>2007-09-24 16:50:32 +0000
commit81fc2f37db98b3472bf997e5f302e65d75670f3e (patch)
tree5974c69e39578359d8d821622fc04c110882a863
parenta98bb16de262c95e3720081acc715a00724a65b8 (diff)
downloadffmpeg-81fc2f37db98b3472bf997e5f302e65d75670f3e.tar.gz
Remove check for input buffer size as it does not guarantee that
decoder will not run out of output buffer bounds (and all suspected decoders have their own checks now). Originally committed as revision 10567 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/utils.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index f2c77b75bc..3d4c2f2f5f 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -962,8 +962,7 @@ int attribute_align_arg avcodec_decode_audio2(AVCodecContext *avctx, int16_t *sa
return -1;
}
if(*frame_size_ptr < FF_MIN_BUFFER_SIZE ||
- *frame_size_ptr < avctx->channels * avctx->frame_size * sizeof(int16_t) ||
- *frame_size_ptr < buf_size){
+ *frame_size_ptr < avctx->channels * avctx->frame_size * sizeof(int16_t)){
av_log(avctx, AV_LOG_ERROR, "buffer %d too small\n", *frame_size_ptr);
return -1;
}