From 313b40efbd63a2c6b9933519ba2b208f1031a9d0 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Thu, 11 Oct 2012 17:56:04 +0000 Subject: [PATCH] bmp: unbreak non BMP_RGB compression for v4 and v5 Fixes CID733728 & CID733729. Signed-off-by: Paul B Mahol --- libavcodec/bmp.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index d0f5b745ce..e8e007299f 100644 --- 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;