Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'

* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
  quickdraw: Make the palette opaque

Conflicts:
	libavcodec/qdrw.c

See: 9f9a1f424e
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/qdrw.c

@@ -61,7 +61,7 @@ static int parse_palette(AVCodecContext *avctx, GetByteContext *gbc,
         bytestream2_skip(gbc, 1);
         b = bytestream2_get_byte(gbc);
         bytestream2_skip(gbc, 1);
-        pal[idx] = 0xFFU << 24 | r << 16 | g << 8 | b;
+        pal[idx] = (0xFFU << 24) | (r << 16) | (g << 8) | b;
     }
     return 0;
 }