diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 20:38:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-13 20:38:49 +0200 |
| commit | 5d9873ecdab8d07c4f928d604a819756bb540e4b (patch) | |
| tree | a18fb5b429e04e5221fbbc21dc891cc6cb819a7a /libavcodec/qdrw.c | |
| parent | cb7c4f73e5e3debe2646279eaa7cfb493573118b (diff) | |
| parent | d0dce15da34c0e4eee6c683be299de0221db00d3 (diff) | |
Merge commit 'd0dce15da34c0e4eee6c683be299de0221db00d3'
* commit 'd0dce15da34c0e4eee6c683be299de0221db00d3':
quickdraw: Make the palette opaque
Conflicts:
libavcodec/qdrw.c
See: 9f9a1f424ed4db992f8a773b2eaad4941de3e9e6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qdrw.c')
| -rw-r--r-- | libavcodec/qdrw.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qdrw.c b/libavcodec/qdrw.c index b7a7cf5f1d..ffc9ffde71 100644 --- a/libavcodec/qdrw.c +++ b/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; } |