summaryrefslogtreecommitdiff
path: root/libswscale
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2014-04-05 14:05:19 -0400
committerJustin Ruggles <justin.ruggles@gmail.com>2014-04-12 13:24:47 -0400
commit60c4660ba035bbfbcc84ac34129ce40e037c70ad (patch)
tree29b52760e5075bb0bcb47b6abb9b55944ab7fcbf /libswscale
parentd4a8a86c6863ecea208fa2f774690b6df4b5bc71 (diff)
swscale: fix an implementation-defined unsigned-to-signed conversion
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/swscale_unscaled.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index 3a956f4f8a..daa6f5f7c6 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1187,9 +1187,9 @@ int attribute_align_arg sws_scale(struct SwsContext *c,
if (usePal(c->srcFormat)) {
for (i = 0; i < 256; i++) {
- int p, r, g, b, y, u, v;
+ int r, g, b, y, u, v;
if (c->srcFormat == AV_PIX_FMT_PAL8) {
- p = ((const uint32_t *)(srcSlice[1]))[i];
+ uint32_t p = ((const uint32_t *)(srcSlice[1]))[i];
r = (p >> 16) & 0xFF;
g = (p >> 8) & 0xFF;
b = p & 0xFF;