[FFmpeg-cvslog] r21993 - trunk/libavcodec/binkaudio.c

[pross]

Author: pross
Date: Tue Feb 23 11:28:11 2010
New Revision: 21993

Log:
Use reported_size to truncate final Bink Audio frame

Modified:
   trunk/libavcodec/binkaudio.c

Modified: trunk/libavcodec/binkaudio.c
==============================================================================
--- trunk/libavcodec/binkaudio.c	Tue Feb 23 09:40:46 2010	(r21992)
+++ trunk/libavcodec/binkaudio.c	Tue Feb 23 11:28:11 2010	(r21993)
@@ -272,11 +272,7 @@ static int decode_frame(AVCodecContext *
         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;
 }