diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-07-04 21:14:53 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-07-05 02:11:17 +0200 |
| commit | 8f6a04a279bb72b9aa73d30b9e43a54fd9b1aedb (patch) | |
| tree | 07c33523de35229cfaf5d3acde4f7e1489d54d6a /libavcodec/bmp.c | |
| parent | d919fdd4f7e8bf5354e99780181cdaedcf879fa5 (diff) | |
| download | ffmpeg-streaming-8f6a04a279bb72b9aa73d30b9e43a54fd9b1aedb.zip ffmpeg-streaming-8f6a04a279bb72b9aa73d30b9e43a54fd9b1aedb.tar.gz | |
Assume that old bmps do not contain transparency information.
Fixes MK50TEMP.BMP that has its RGB channel bit masks on the actual image.
Diffstat (limited to 'libavcodec/bmp.c')
| -rw-r--r-- | libavcodec/bmp.c | 1 |
1 files changed, 1 insertions, 0 deletions
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); } |
