Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavcodec / dpxenc.c

diff --git a/libavcodec/dpxenc.c b/libavcodec/dpxenc.c
index 305393f66f00d3136d7de8ac19a154976cb1aa9f..0a4662d78aa45b0990ceda1a3f55c43708f062b6 100644 (file)
--- a/libavcodec/dpxenc.c
+++ b/libavcodec/dpxenc.c
@@ -37,10 +37,10 @@ static av_cold int encode_init(AVCodecContext *avctx)
     DPXContext *s = avctx->priv_data;
     const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(avctx->pix_fmt);
 
-    s->big_endian         = !!(desc->flags & PIX_FMT_BE);
+    s->big_endian         = !!(desc->flags & AV_PIX_FMT_FLAG_BE);
     s->bits_per_component = desc->comp[0].depth_minus1 + 1;
-    s->descriptor         = (desc->flags & PIX_FMT_ALPHA) ? 51 : 50;
-    s->planar             = !!(desc->flags & PIX_FMT_PLANAR);
+    s->descriptor         = (desc->flags & AV_PIX_FMT_FLAG_ALPHA) ? 51 : 50;
+    s->planar             = !!(desc->flags & AV_PIX_FMT_FLAG_PLANAR);
 
     switch (avctx->pix_fmt) {
     case AV_PIX_FMT_GBRP10BE:
@@ -114,11 +114,11 @@ static void encode_gbrp10(AVCodecContext *avctx, const AVPicture *pic, uint8_t *
             if (s->big_endian) {
                 value = (AV_RB16(src[0] + 2*x) << 12)
                       | (AV_RB16(src[1] + 2*x) << 2)
-                      | (AV_RB16(src[2] + 2*x) << 22);
+                      | ((unsigned)AV_RB16(src[2] + 2*x) << 22);
             } else {
                 value = (AV_RL16(src[0] + 2*x) << 12)
                       | (AV_RL16(src[1] + 2*x) << 2)
-                      | (AV_RL16(src[2] + 2*x) << 22);
+                      | ((unsigned)AV_RL16(src[2] + 2*x) << 22);
             }
             write32(dst, value);
             dst += 4;