summaryrefslogtreecommitdiff
path: root/libavcodec/bmp.c
diff options
context:
space:
mode:
authorami_stuff <ami_stuff@o2.pl>2011-12-03 12:34:12 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-03 12:34:12 +0100
commit28a11a67d2129f1e290f8e8fdb3970801be0cfc2 (patch)
treeb4141c590928f57ecd3c0b2eea00524cfb45d2f1 /libavcodec/bmp.c
parent8dcd2a41ecff8cc1e9b20cc267df54c59878ab3b (diff)
BMP: Support BMP OS/2 v2 with RLE compression.
Fixes ticket #699. Patch also provided by Peter Ross.
Diffstat (limited to 'libavcodec/bmp.c')
-rw-r--r--libavcodec/bmp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 3418edc181..81ecf6e50b 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -115,7 +115,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
depth = bytestream_get_le16(&buf);
- if(ihsize == 40)
+ if(ihsize == 40 || ihsize == 64)
comp = bytestream_get_le32(&buf);
else
comp = BMP_RGB;