From c8c77d8d97be1eb863da606d282590c8ef5c44e5 Mon Sep 17 00:00:00 2001 From: Peter Ross Date: Tue, 23 Feb 2010 10:28:11 +0000 Subject: [PATCH] Use reported_size to truncate final Bink Audio frame Originally committed as revision 21993 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/binkaudio.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/libavcodec/binkaudio.c b/libavcodec/binkaudio.c index 1aca5bceb0..b3f74d04d3 100644 --- a/libavcodec/binkaudio.c +++ b/libavcodec/binkaudio.c @@ -272,11 +272,7 @@ static int decode_frame(AVCodecContext *avctx, get_bits_align32(gb); } - *data_size = (uint8_t*)samples - (uint8_t*)data; - if (reported_size != *data_size) { - av_log(avctx, AV_LOG_WARNING, "reported data size (%d) does not match output data size (%d)\n", - reported_size, *data_size); - } + *data_size = FFMIN(reported_size, (uint8_t*)samples - (uint8_t*)data); return buf_size; }