bmp: unbreak non BMP_RGB compression for v4 and v5

Fixes CID733728 & CID733729. Signed-off-by: Paul B Mahol <onemda@gmail.com>
12 years ago · 313b40efbd
parent 9ad1ea13e0
commit 313b40efbd
1 changed files with 2 additions and 3 deletions
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@ -118,7 +118,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;
@ -133,8 +133,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;