[FFmpeg-cvslog] bmp: unbreak non BMP_RGB compression for v4 and v5

[Paul B Mahol]

ffmpeg | branch: release/0.10 | Paul B Mahol <onemda at gmail.com> | Thu Oct 11 17:56:04 2012 +0000| [c9df500190ee9e2f4a7471e483069c06b24f5b00] | committer: Michael Niedermayer

bmp: unbreak non BMP_RGB compression for v4 and v5

Fixes CID733728 & CID733729.

Signed-off-by: Paul B Mahol <onemda at gmail.com>
(cherry picked from commit 313b40efbd63a2c6b9933519ba2b208f1031a9d0)

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9df500190ee9e2f4a7471e483069c06b24f5b00
---

 libavcodec/bmp.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index a286584..14fd193 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -117,7 +117,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
 
     depth = bytestream_get_le16(&buf);
 
-    if(ihsize == 40 || ihsize == 64 || ihsize == 56)
+    if (ihsize >= 40)
         comp = bytestream_get_le32(&buf);
     else
         comp = BMP_RGB;
@@ -132,8 +132,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
         rgb[0] = bytestream_get_le32(&buf);
         rgb[1] = bytestream_get_le32(&buf);
         rgb[2] = bytestream_get_le32(&buf);
-        if (ihsize >= 108)
-            alpha = bytestream_get_le32(&buf);
+        alpha = bytestream_get_le32(&buf);
     }
 
     avctx->width = width;