[FFmpeg-devel] [PATCH] bmpdec: support IBM OS/2 v2.x bitmap header

[Peter Ross]

Fixes ticket #699.

Based on patch by ami_stuff
---
 libavcodec/bmp.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 3418edc..81ecf6e 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -115,7 +115,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
 
     depth = bytestream_get_le16(&buf);
 
-    if(ihsize == 40)
+    if(ihsize == 40 || ihsize == 64)
         comp = bytestream_get_le32(&buf);
     else
         comp = BMP_RGB;
-- 
1.7.7.3

-- Peter
(A907 E02F A6E5 0CD2 34CD 20D2 6760 79C5 AC40 DD6B)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20111203/b9856565/attachment.asc>