diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-12-08 02:14:36 +0100 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2011-12-08 02:45:53 +0100 |
| commit | 9608e3a182fdd05fcc8056a25a8aaa91eb1746cc (patch) | |
| tree | bae73b04b148712afdeecad7035af0d4dd921587 /libavcodec/bmp.c | |
| parent | 6778f9d9f225cd9ec33ac49a5ec29f3542f980c8 (diff) | |
| download | ffmpeg-9608e3a182fdd05fcc8056a25a8aaa91eb1746cc.tar.gz | |
Support decoding 56 byte BMP Bitmap Information Header.
Fixes ticket #719.
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 5971145401..e97f6ed67c 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; |