diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 03:17:13 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-14 03:26:31 +0200 |
commit | b12d92efd6c0d48665383a9baecc13e7ebbd8a22 (patch) | |
tree | 2e1493948ffac773901d9d737fd0cd8b468d02f8 /libavcodec/yop.c | |
parent | d3d715ff134555570d7e2c2aa15aad50f6c6fdbd (diff) | |
download | ffmpeg-b12d92efd6c0d48665383a9baecc13e7ebbd8a22.tar.gz |
avoid "0xFF << 24" as it is considered a integer overflow in C99
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/yop.c')
-rw-r--r-- | libavcodec/yop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 3e27c1fe27..21036284b2 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -235,7 +235,7 @@ static int yop_decode_frame(AVCodecContext *avctx, void *data, int *data_size, palette[i + firstcolor] = (s->srcptr[0] << 18) | (s->srcptr[1] << 10) | (s->srcptr[2] << 2); - palette[i + firstcolor] |= 0xFF << 24 | + palette[i + firstcolor] |= 0xFFU << 24 | (palette[i + firstcolor] >> 6) & 0x30303; } |