diff options
-rw-r--r-- | libavcodec/bmp.c | 2 | ||||
-rw-r--r-- | libavcodec/msrle.c | 2 | ||||
-rw-r--r-- | libavcodec/sunrast.c | 2 | ||||
-rw-r--r-- | libavformat/avidec.c | 4 | ||||
-rw-r--r-- | libavutil/imgutils.c | 2 |
5 files changed, 6 insertions, 6 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); diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 0e8a0e539d..2792f8b004 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 f20e6820be..eb245dab1a 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; diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 835c36d4e4..9285229dcb 100644 --- a/libavformat/avidec.c +++ b/libavformat/avidec.c @@ -626,7 +626,7 @@ static int avi_read_header(AVFormatContext *s) pal_size = FFMIN(pal_size, st->codec->extradata_size); pal_src = st->codec->extradata + st->codec->extradata_size - pal_size; for (i = 0; i < pal_size/4; i++) - ast->pal[i] = 0xFF<<24 | AV_RL32(pal_src+4*i); + ast->pal[i] = 0xFFU<<24 | AV_RL32(pal_src+4*i); ast->has_pal = 1; } @@ -1009,7 +1009,7 @@ start_sync: avio_rl16(pb); //flags for (; k <= last; k++) - ast->pal[k] = 0xFF<<24 | avio_rb32(pb)>>8;// b + (g << 8) + (r << 16); + ast->pal[k] = 0xFFU<<24 | avio_rb32(pb)>>8;// b + (g << 8) + (r << 16); ast->has_pal= 1; goto start_sync; } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) || diff --git a/libavutil/imgutils.c b/libavutil/imgutils.c index 57ee07d32b..e4460d3cea 100644 --- a/libavutil/imgutils.c +++ b/libavutil/imgutils.c @@ -180,7 +180,7 @@ int ff_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt) default: return AVERROR(EINVAL); } - pal[i] = b + (g<<8) + (r<<16) + (0xFF<<24); + pal[i] = b + (g<<8) + (r<<16) + (0xFFU<<24); } return 0; |