From 2fed05f53a881b64a02de7a324d67d8c029c6cf1 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sun, 14 Oct 2012 03:34:16 +0200 Subject: 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 --- libavformat/avidec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavformat') 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) || -- cgit v1.1