Commit 4a14e666 authored by Kostya Shishkov's avatar Kostya Shishkov

Add known BMP header sizes.

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

Originally committed as revision 15922 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 4deaa946
...@@ -85,13 +85,19 @@ static int bmp_decode_frame(AVCodecContext *avctx, ...@@ -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;
} }
......
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