virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Add known BMP header sizes.

Browse Source 
Now 11B*.bmp from samples repository can be decoded.

Originally committed as revision 15922 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Kostya Shishkov
2008-11-24 10:53:13 +00:00
parent 4deaa94639
commit 4a14e66605
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/bmp.c
View File

@@ -85,13 +85,19 @@ static int bmp_decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
if (ihsize == 40) { switch(ihsize){
case 40: // windib v3
case 64: // OS/2 v2
case 108: // windib v4
case 124: // windib v5
width = bytestream_get_le32(&buf); width = bytestream_get_le32(&buf);
height = bytestream_get_le32(&buf); height = bytestream_get_le32(&buf);
} else if (ihsize == 12) { break;
case 12: // OS/2 v1
width = bytestream_get_le16(&buf); width = bytestream_get_le16(&buf);
height = bytestream_get_le16(&buf); height = bytestream_get_le16(&buf);
} else { break;
default:
av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n"); av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome\n");
return -1; return -1;
} }