Merge commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c'

* commit 'fdd5c48ebdec489ec9e84eee547fefa50c3ad53c':
  texturedsp: Explicitly cast RGBA parameters to unsigned

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavcodec/texturedsp.c
index 19aa3538213cd4a505cdd4fb326d85b700237fe6,58446b1e69b9d2f74a84c8c810084e603f733e14..f32d1b3a558ca5de64aebc22682440f9e48e4983
--- 1/libavcodec/texturedsp.c
--- 2/libavcodec/texturedsp.c
+++ b/libavcodec/texturedsp.c
@@@ -31,7 -31,10 +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)
++#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,