diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 03:34:16 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 03:34:16 +0200 |
commit | 2fed05f53a881b64a02de7a324d67d8c029c6cf1 (patch) | |
tree | e250fe74aa4036d1c42a55c81ff2781861b4b178 /libavcodec | |
parent | b12d92efd6c0d48665383a9baecc13e7ebbd8a22 (diff) | |
download | ffmpeg-streaming-2fed05f53a881b64a02de7a324d67d8c029c6cf1.zip ffmpeg-streaming-2fed05f53a881b64a02de7a324d67d8c029c6cf1.tar.gz |
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')
-rw-r--r-- | libavcodec/bmp.c | 2 | ||||
-rw-r--r-- | libavcodec/msrle.c | 2 | ||||
-rw-r--r-- | libavcodec/sunrast.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bmp.c b/libavcodec/bmp.c index e8e0072..9aee375 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); diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 0e8a0e5..2792f8b 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -75,7 +75,7 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx) if (avctx->extradata_size >= AVPALETTE_SIZE) for (i = 0; i < AVPALETTE_SIZE/4; i++) - s->pal[i] = 0xFF<<24 | AV_RL32(avctx->extradata+4*i); + s->pal[i] = 0xFFU<<24 | AV_RL32(avctx->extradata+4*i); return 0; } diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index f20e682..eb245da 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -141,7 +141,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, ptr = p->data[1]; for (x = 0; x < len; x++, ptr += 4) - *(uint32_t *)ptr = (0xFF<<24) + (buf[x]<<16) + (buf[len+x]<<8) + buf[len+len+x]; + *(uint32_t *)ptr = (0xFFU<<24) + (buf[x]<<16) + (buf[len+x]<<8) + buf[len+len+x]; } buf += maplength; |