RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 20:07:04 +00:00
Code Issues Projects Releases Wiki Activity

Support decoding 56 byte BMP Bitmap Information Header.

Browse Source 
Fixes ticket #719.
This commit is contained in:
Carl Eugen Hoyos 2011-12-08 02:14:36 +01:00
parent 6778f9d9f2
commit 9608e3a182
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/bmp.c
View File

@ -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,
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;