[FFmpeg-cvslog] BMP: Support BMP OS/2 v2 with RLE compression.
ami_stuff
git at videolan.org
Sat Dec 3 12:38:50 CET 2011
ffmpeg | branch: master | ami_stuff <ami_stuff at o2.pl> | Sat Dec 3 12:34:12 2011 +0100| [28a11a67d2129f1e290f8e8fdb3970801be0cfc2] | committer: Carl Eugen Hoyos
BMP: Support BMP OS/2 v2 with RLE compression.
Fixes ticket #699.
Patch also provided by Peter Ross.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=28a11a67d2129f1e290f8e8fdb3970801be0cfc2
---
libavcodec/bmp.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 3418edc..81ecf6e 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;
More information about the ffmpeg-cvslog
mailing list