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 /libavformat | |
| 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 'libavformat')
| -rw-r--r-- | libavformat/avidec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c index 835c36d..9285229 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) || |
