summaryrefslogtreecommitdiff
path: root/libavcodec/bmp.c
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-30 00:48:32 +0100
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2011-12-30 00:48:32 +0100
commit3a15051aba3c071ac1bff5ea91151a909dfa9257 (patch)
tree39af58d12ef481185f6f8fad13946ba5b861b55f /libavcodec/bmp.c
parentf41a6c8f3aeb51332bb359038cb504d3fb562a52 (diff)
downloadffmpeg-3a15051aba3c071ac1bff5ea91151a909dfa9257.tar.gz
Always assume the bmp palette as being opaque.
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 419c3fa197..9a5c244644 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -247,7 +247,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
((uint32_t*)p->data[1])[i] = (0xff<<24) | bytestream_get_le24(&buf);
}else{
for(i = 0; i < colors; i++)
- ((uint32_t*)p->data[1])[i] = bytestream_get_le32(&buf);
+ ((uint32_t*)p->data[1])[i] = 0xFFU << 24 | bytestream_get_le32(&buf);
}
buf = buf0 + hsize;
}