Merge commit '79922d7237aba2b8c6abbd2e06a0c08e4f498ad4'

[ffmpeg] / libavcodec / jvdec.c

diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c
index cec28cceae7fd47a242dc87984bb84aa03b8dda0..976ce08db2d3741f83856c006b3d0ef1537472a6 100644 (file)
--- a/libavcodec/jvdec.c
+++ b/libavcodec/jvdec.c
@@ -177,7 +177,7 @@ static int decode_frame(AVCodecContext *avctx,
     if (buf_end - buf >= AVPALETTE_COUNT * 3) {
         for (i = 0; i < AVPALETTE_COUNT; i++) {
             uint32_t pal = AV_RB24(buf);
-            s->palette[i] = 0xFF << 24 | pal << 2 | ((pal >> 4) & 0x30303);
+            s->palette[i] = 0xFFU << 24 | pal << 2 | ((pal >> 4) & 0x30303);
             buf += 3;
         }
         s->palette_has_changed = 1;