summaryrefslogtreecommitdiff
path: root/libavcodec/bmp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-14 03:34:16 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-14 03:34:16 +0200
commit2fed05f53a881b64a02de7a324d67d8c029c6cf1 (patch)
treee250fe74aa4036d1c42a55c81ff2781861b4b178 /libavcodec/bmp.c
parentb12d92efd6c0d48665383a9baecc13e7ebbd8a22 (diff)
avoid more "0xFF << 24" as it is considered a integer overflow in C99
missed these in my previous search and replace Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 e8e007299f..9aee3756f1 100644
--- a/libavcodec/bmp.c
+++ b/libavcodec/bmp.c
@@ -257,7 +257,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
buf = buf0 + 14 + ihsize; //palette location
if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry
for(i = 0; i < colors; i++)
- ((uint32_t*)p->data[1])[i] = (0xff<<24) | bytestream_get_le24(&buf);
+ ((uint32_t*)p->data[1])[i] = (0xFFU<<24) | bytestream_get_le24(&buf);
}else{
for(i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = 0xFFU << 24 | bytestream_get_le32(&buf);