From b65213c021c458f104189755ea3ac3e76668b458 Mon Sep 17 00:00:00 2001 From: Benoit Fouet Date: Mon, 14 Apr 2008 13:13:08 +0000 Subject: Support for BMP os2v1. Originally committed as revision 12815 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/bmp.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'libavcodec/bmp.c') diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index 52de3be214..de97e6bd3b 100644 --- a/libavcodec/bmp.c +++ b/libavcodec/bmp.c @@ -84,8 +84,16 @@ static int bmp_decode_frame(AVCodecContext *avctx, return -1; } + if (ihsize == 40) { width = bytestream_get_le32(&buf); height = bytestream_get_le32(&buf); + } else if (ihsize == 12) { + width = bytestream_get_le16(&buf); + height = bytestream_get_le16(&buf); + } else { + av_log(avctx, AV_LOG_ERROR, "unsupported BMP file, patch welcome"); + return -1; + } if(bytestream_get_le16(&buf) != 1){ /* planes */ av_log(avctx, AV_LOG_ERROR, "invalid BMP header\n"); @@ -94,7 +102,7 @@ static int bmp_decode_frame(AVCodecContext *avctx, depth = bytestream_get_le16(&buf); - if(ihsize > 16) + if(ihsize == 40) comp = bytestream_get_le32(&buf); else comp = BMP_RGB; -- cgit v1.2.3