summaryrefslogtreecommitdiff
path: root/libavcodec/texturedsp.c
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2015-11-29 16:07:59 +0100
committerHendrik Leppkes <h.leppkes@gmail.com>2015-11-29 16:07:59 +0100
commit503153a96782801bf3274e7aef74831801a002c6 (patch)
tree4331a74322757932c9c96b886be8b1126a426ea9 /libavcodec/texturedsp.c
parentc754591677367ee9a95ce138daa68d36df0b6ce4 (diff)
parentfdd5c48ebdec489ec9e84eee547fefa50c3ad53c (diff)
Merge commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c'
* commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c': texturedsp: Explicitly cast RGBA parameters to unsigned Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/texturedsp.c')
-rw-r--r--libavcodec/texturedsp.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/texturedsp.c b/libavcodec/texturedsp.c
index 19aa353821..f32d1b3a55 100644
--- a/libavcodec/texturedsp.c
+++ b/libavcodec/texturedsp.c
@@ -31,7 +31,10 @@
#include "texturedsp.h"
-#define RGBA(r, g, b, a) ((r) | ((g) << 8) | ((b) << 16) | ((a) << 24))
+#define RGBA(r, g, b, a) (((uint8_t)(r) << 0) | \
+ ((uint8_t)(g) << 8) | \
+ ((uint8_t)(b) << 16) | \
+ ((uint8_t)(a) << 24))
static av_always_inline void extract_color(uint32_t colors[4],
uint16_t color0,