From dd344b43e87ef5a24a4ba739821998605e38a015 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 1 Nov 2013 13:00:15 +0100
Subject: Enable -Wshadow

This one really did bite me hard (see previous commit), so enable it by
default.

Fix some cases of shadowing throughout the codebase. None of these
change behavior, and all of these were correct code, and just tripped up
the warning.
---
 video/filter/vf_vavpp.c |  4 ++--
 video/filter/vf_yadif.c | 12 ++++++------
 video/out/vo_vdpau.c    |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'video')

diff --git a/video/filter/vf_vavpp.c b/video/filter/vf_vavpp.c
index 62dd9a77a0..f9f77a1b64 100644
--- a/video/filter/vf_vavpp.c
+++ b/video/filter/vf_vavpp.c
@@ -342,8 +342,8 @@ static bool initialize(struct vf_priv_s *p)
             if (!num)
                 continue;
             VAProcDeinterlacingType algorithm = VAProcDeinterlacingBob;
-            for (int i=0; i<num; ++i) { // find Bob
-                if (caps[i].type != algorithm)
+            for (int n=0; n < num; n++) { // find Bob
+                if (caps[n].type != algorithm)
                     continue;
                 VAProcFilterParameterBufferDeinterlacing param;
                 param.type = VAProcFilterDeinterlacing;
diff --git a/video/filter/vf_yadif.c b/video/filter/vf_yadif.c
index b9a48c6da2..b53b1bf594 100644
--- a/video/filter/vf_yadif.c
+++ b/video/filter/vf_yadif.c
@@ -311,16 +311,16 @@ static void filter_line_c(struct vf_priv_s *p, uint8_t *dst, uint8_t *prev, uint
         int spatial_score= FFABS(cur[-refs-1] - cur[+refs-1]) + FFABS(c-e)
                          + FFABS(cur[-refs+1] - cur[+refs+1]) - 1;
 
-#define CHECK(j)\
-    {   int score= FFABS(cur[-refs-1+j] - cur[+refs-1-j])\
+#define CHECK(x, j)\
+    {   int score##x= FFABS(cur[-refs-1+j] - cur[+refs-1-j])\
                  + FFABS(cur[-refs  +j] - cur[+refs  -j])\
                  + FFABS(cur[-refs+1+j] - cur[+refs+1-j]);\
-        if(score < spatial_score){\
-            spatial_score= score;\
+        if(score##x < spatial_score){\
+            spatial_score= score##x;\
             spatial_pred= (cur[-refs  +j] + cur[+refs  -j])>>1;\
 
-        CHECK(-1) CHECK(-2) }} }}
-        CHECK( 1) CHECK( 2) }} }}
+        CHECK(0, -1) CHECK(1, -2) }} }}
+        CHECK(0,  1) CHECK(1,  2) }} }}
 
         if(p->mode<2){
             int b= (prev2[-2*refs] + next2[-2*refs])>>1;
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index 2140bde948..fd6f87edb9 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -1356,7 +1356,6 @@ static void draw_image(struct vo *vo, mp_image_t *mpi)
             return;
         surface = (VdpVideoSurface)(intptr_t)reserved_mpi->planes[3];
         if (handle_preemption(vo) >= 0) {
-            VdpStatus vdp_st;
             const void *destdata[3] = {mpi->planes[0], mpi->planes[2],
                                        mpi->planes[1]};
             if (vc->image_format == IMGFMT_NV12)
-- 
cgit v1.2.3