[FFmpeg-cvslog] Assume that old bmps do not contain transparency information.

Carl Eugen Hoyos git at videolan.org
Sat Jul 5 04:26:54 CEST 2014


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Fri Jul  4 21:14:53 2014 +0200| [8f6a04a279bb72b9aa73d30b9e43a54fd9b1aedb] | committer: Carl Eugen Hoyos

Assume that old bmps do not contain transparency information.

Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f6a04a279bb72b9aa73d30b9e43a54fd9b1aedb
---

 libavcodec/bmp.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c
index 7443fa9..ec4c467 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -128,6 +128,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
         rgb[0] = bytestream_get_le32(&buf);
         rgb[1] = bytestream_get_le32(&buf);
         rgb[2] = bytestream_get_le32(&buf);
+        if (ihsize > 40)
         alpha = bytestream_get_le32(&buf);
     }
 



More information about the ffmpeg-cvslog mailing list