[Ffmpeg-cvslog] r6844 - trunk/libavcodec/bmp.c

[mru]

Author: mru
Date: Mon Oct 30 21:43:07 2006
New Revision: 6844

Modified:
   trunk/libavcodec/bmp.c

Log:
coded line size is a multiple of 4


Modified: trunk/libavcodec/bmp.c
==============================================================================
--- trunk/libavcodec/bmp.c	(original)
+++ trunk/libavcodec/bmp.c	Mon Oct 30 21:43:07 2006
@@ -177,7 +177,8 @@
     buf += hsize;
     dsize = buf_size - hsize;
 
-    n = avctx->width * (depth / 8);
+    /* Line size in file multiple of 4 */
+    n = (avctx->width * (depth / 8) + 3) & ~3;
 
     if(n * avctx->height > dsize){
         av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",