virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avoid more "0xFF << 24" as it is considered a integer overflow in C99

Browse Source 
missed these in my previous search and replace

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-10-14 03:34:16 +02:00
parent b12d92efd6
commit 2fed05f53a
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/bmp.c
View File

@ -257,7 +257,7 @@ static int bmp_decode_frame(AVCodecContext *avctx,
buf = buf0 + 14 + ihsize; //palette location buf = buf0 + 14 + ihsize; //palette location
if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry if((hsize-ihsize-14) < (colors << 2)){ // OS/2 bitmap, 3 bytes per palette entry
for(i = 0; i < colors; i++) 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{ }else{
for(i = 0; i < colors; i++) for(i = 0; i < colors; i++)
((uint32_t*)p->data[1])[i] = 0xFFU << 24 | bytestream_get_le32(&buf); ((uint32_t*)p->data[1])[i] = 0xFFU << 24 | bytestream_get_le32(&buf);

2
libavcodec/msrle.c
View File

@ -75,7 +75,7 @@ static av_cold int msrle_decode_init(AVCodecContext *avctx)
if (avctx->extradata_size >= AVPALETTE_SIZE) if (avctx->extradata_size >= AVPALETTE_SIZE)
for (i = 0; i < AVPALETTE_SIZE/4; i++) 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; return 0;
} }

2
libavcodec/sunrast.c
View File

@ -141,7 +141,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
ptr = p->data[1]; ptr = p->data[1];
for (x = 0; x < len; x++, ptr += 4) 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; buf += maplength;

4
libavformat/avidec.c
View File

@ -626,7 +626,7 @@ static int avi_read_header(AVFormatContext *s)
pal_size = FFMIN(pal_size, st->codec->extradata_size); pal_size = FFMIN(pal_size, st->codec->extradata_size);
pal_src = st->codec->extradata + st->codec->extradata_size - pal_size; pal_src = st->codec->extradata + st->codec->extradata_size - pal_size;
for (i = 0; i < pal_size/4; i++) 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; ast->has_pal = 1;
} }
@ -1009,7 +1009,7 @@ start_sync:
avio_rl16(pb); //flags avio_rl16(pb); //flags
for (; k <= last; k++) 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; ast->has_pal= 1;
goto start_sync; goto start_sync;
} else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) || } else if( ((ast->prefix_count<5 || sync+9 > i) && d[2]<128 && d[3]<128) ||

2
libavutil/imgutils.c
View File

@ -180,7 +180,7 @@ int ff_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt)
default: default:
return AVERROR(EINVAL); return AVERROR(EINVAL);
} }
pal[i] = b + (g<<8) + (r<<16) + (0xFF<<24); pal[i] = b + (g<<8) + (r<<16) + (0xFFU<<24);
} }
return 0; return 0;