[FFmpeg-cvslog] Support decoding 56 byte BMP Bitmap Information Header.

[Carl Eugen Hoyos]

ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Thu Dec  8 02:14:36 2011 +0100| [9608e3a182fdd05fcc8056a25a8aaa91eb1746cc] | committer: Carl Eugen Hoyos

Support decoding 56 byte BMP Bitmap Information Header.

Fixes ticket #719.

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

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

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 5971145..e97f6ed 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -92,7 +92,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
     }
 
     switch(ihsize){
-    case  40: // windib v3
+    case  40: // windib
+    case  56: // windib v3
     case  64: // OS/2 v2
     case 108: // windib v4
     case 124: // windib v5
@@ -115,7 +116,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
 
     depth = bytestream_get_le16(&buf);
 
-    if(ihsize == 40 || ihsize == 64)
+    if(ihsize == 40 || ihsize == 64 || ihsize == 56)
         comp = bytestream_get_le32(&buf);
     else
         comp = BMP_RGB;