diff options
-rw-r--r-- | libswscale/swscale.c | 4 | ||||
-rw-r--r-- | libswscale/swscale_unscaled.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/libswscale/swscale.c b/libswscale/swscale.c index f529331f0f..cbf1074109 100644 --- a/libswscale/swscale.c +++ b/libswscale/swscale.c @@ -952,9 +952,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, a = 0xff; + int r, g, b, y, u, v, a = 0xff; if (c->srcFormat == AV_PIX_FMT_PAL8) { - p = ((const uint32_t *)(srcSlice[1]))[i]; + uint32_t p = ((const uint32_t *)(srcSlice[1]))[i]; a = (p >> 24) & 0xFF; r = (p >> 16) & 0xFF; g = (p >> 8) & 0xFF; diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 8eace667e4..18c35429f9 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1755,7 +1755,6 @@ void ff_get_unscaled_swscale(SwsContext *c) ff_get_unscaled_swscale_ppc(c); // if (ARCH_ARM) // ff_get_unscaled_swscale_arm(c); - } /* Convert the palette to the same packed 32-bit format as the palette */ |