# HG changeset patch
# User darkshikari
# Date 1279856677 0
# Node ID e6ade5e849c9875336058e5b592a322c00b5e4a6
# Parent  13b1ad24a4b16392dc1d425b23548d76231b27a8
VP8: Clean up some variable shadowing.

diff -r 13b1ad24a4b1 -r e6ade5e849c9 vp8.c
--- a/vp8.c	Fri Jul 23 03:02:56 2010 +0000
+++ b/vp8.c	Fri Jul 23 03:44:37 2010 +0000
@@ -1188,16 +1188,16 @@
 
 static void idct_mb(VP8Context *s, uint8_t *dst[3], VP8Macroblock *mb)
 {
-    int x, y, ch, nnz;
+    int x, y, ch;
 
     if (mb->mode != MODE_I4x4) {
         uint8_t *y_dst = dst[0];
         for (y = 0; y < 4; y++) {
-            uint32_t nnz = AV_RN32A(s->non_zero_count_cache[y]);
-            if (nnz) {
-                if (nnz&~0x01010101) {
+            uint32_t nnz4 = AV_RN32A(s->non_zero_count_cache[y]);
+            if (nnz4) {
+                if (nnz4&~0x01010101) {
                     for (x = 0; x < 4; x++) {
-                        nnz = s->non_zero_count_cache[y][x];
+                        int nnz = s->non_zero_count_cache[y][x];
                         if (nnz) {
                             if (nnz == 1)
                                 s->vp8dsp.vp8_idct_dc_add(y_dst+4*x, s->block[y][x], s->linesize);
@@ -1218,7 +1218,7 @@
             uint8_t *ch_dst = dst[1+ch];
             for (y = 0; y < 2; y++) {
                 for (x = 0; x < 2; x++) {
-                    nnz = s->non_zero_count_cache[4+ch][(y<<1)+x];
+                    int nnz = s->non_zero_count_cache[4+ch][(y<<1)+x];
                     if (nnz) {
                         if (nnz == 1)
                             s->vp8dsp.vp8_idct_dc_add(ch_dst+4*x, s->block[4+ch][(y<<1)+x], s->uvlinesize);