Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

[ffmpeg] / libavcodec / eacmv.c

diff --git a/libavcodec/eacmv.c b/libavcodec/eacmv.c
index 6b23758470532bda1c89de0f5ae6a7879501cdd5..d3de7cac2934e5701b3d6d1a65ded7740de73539 100644 (file)
--- a/libavcodec/eacmv.c
+++ b/libavcodec/eacmv.c
@@ -49,7 +49,7 @@ static av_cold int cmv_decode_init(AVCodecContext *avctx){
     avcodec_get_frame_defaults(&s->last2_frame);
 
     s->avctx = avctx;
-    avctx->pix_fmt = PIX_FMT_PAL8;
+    avctx->pix_fmt = AV_PIX_FMT_PAL8;
     return 0;
 }
 
@@ -142,7 +142,7 @@ static void cmv_process_header(CmvContext *s, const uint8_t *buf, const uint8_t
 
     buf += 16;
     for (i=pal_start; i<pal_start+pal_count && i<AVPALETTE_COUNT && buf_end - buf >= 3; i++) {
-        s->palette[i] = 0xFF << 24 | AV_RB24(buf);
+        s->palette[i] = 0xFFU << 24 | AV_RB24(buf);
         buf += 3;
     }
 }