Skip to content

F
ffmpeg
Commit 9608e3a1 authored by Carl Eugen Hoyos's avatar Carl Eugen Hoyos
Browse files
Options

Support decoding 56 byte BMP Bitmap Information Header. 

Fixes ticket #719.
parent 6778f9d9
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
libavcodec/bmp.c
View file @ 9608e3a1
...@@ -92,7 +92,8 @@ static int bmp_decode_frame(AVCodecContext *avctx, ...@@ -92,7 +92,8 @@ static int bmp_decode_frame(AVCodecContext *avctx,
} }
switch(ihsize){ switch(ihsize){
case 40: // windib v3 case 40: // windib
case 56: // windib v3
case 64: // OS/2 v2 case 64: // OS/2 v2
case 108: // windib v4 case 108: // windib v4
case 124: // windib v5 case 124: // windib v5
...@@ -115,7 +116,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, ...@@ -115,7 +116,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
depth = bytestream_get_le16(&buf); depth = bytestream_get_le16(&buf);
if(ihsize == 40 || ihsize == 64) if(ihsize == 40 || ihsize == 64 || ihsize == 56)
comp = bytestream_get_le32(&buf); comp = bytestream_get_le32(&buf);
else else
comp = BMP_RGB; comp = BMP_RGB;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment