From: Kostya Shishkov <kostya.shishkov@gmail.com>
Date: Tue, 23 Sep 2008 08:32:18 +0000 (+0000)
Subject: Calculate line size correctly for bit depths < 8
X-Git-Tag: v0.5~2442
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a79cae798a8a5c41b612c7effe0c34124de421db;p=platform%2Fupstream%2Flibav.git

Calculate line size correctly for bit depths < 8

Originally committed as revision 15388 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index ff34ab75f..6f815e6c2 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -175,7 +175,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
     dsize = buf_size - hsize;
 
     /* Line size in file multiple of 4 */
-    n = (avctx->width * (depth / 8) + 3) & ~3;
+    n = ((avctx->width * depth) / 8 + 3) & ~3;
 
     if(n * avctx->height > dsize){
         av_log(avctx, AV_LOG_ERROR, "not enough data (%d < %d)\n",