shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9_convolve.c: cleanup -wextra warnings"

--- a/vp9/common/vp9_convolve.c

+++ b/vp9/common/vp9_convolve.c

@@ -156,6 +156,9 @@

   const InterpKernel *const filters_x = get_filter_base(filter_x);

   const int x0_q4 = get_filter_offset(filter_x, filters_x);

+  (void)filter_y;

+  (void)y_step_q4;

+

   convolve_horiz(src, src_stride, dst, dst_stride, filters_x,

                  x0_q4, x_step_q4, w, h);

 }

@@ -168,6 +171,9 @@

   const InterpKernel *const filters_x = get_filter_base(filter_x);

   const int x0_q4 = get_filter_offset(filter_x, filters_x);

+  (void)filter_y;

+  (void)y_step_q4;

+

   convolve_avg_horiz(src, src_stride, dst, dst_stride, filters_x,

                      x0_q4, x_step_q4, w, h);

 }

@@ -179,6 +185,10 @@

                           int w, int h) {

   const InterpKernel *const filters_y = get_filter_base(filter_y);

   const int y0_q4 = get_filter_offset(filter_y, filters_y);

+

+  (void)filter_x;

+  (void)x_step_q4;

+

   convolve_vert(src, src_stride, dst, dst_stride, filters_y,

                 y0_q4, y_step_q4, w, h);

 }

@@ -190,6 +200,10 @@

                               int w, int h) {

   const InterpKernel *const filters_y = get_filter_base(filter_y);

   const int y0_q4 = get_filter_offset(filter_y, filters_y);

+

+  (void)filter_x;

+  (void)x_step_q4;

+

   convolve_avg_vert(src, src_stride, dst, dst_stride, filters_y,

                     y0_q4, y_step_q4, w, h);

 }

@@ -232,6 +246,9 @@

                          int w, int h) {

   int r;

+  (void)filter_x;  (void)filter_x_stride;

+  (void)filter_y;  (void)filter_y_stride;

+

   for (r = h; r > 0; --r) {

     vpx_memcpy(dst, src, w);

     src += src_stride;

@@ -245,6 +262,9 @@

                         const int16_t *filter_y, int filter_y_stride,

                         int w, int h) {

   int x, y;

+

+  (void)filter_x;  (void)filter_x_stride;

+  (void)filter_y;  (void)filter_y_stride;

   for (y = 0; y < h; ++y) {

     for (x = 0; x < w; ++x)

-- 

⑨