diff options
| author | Johann <johannkoenig@google.com> | 2014-05-06 09:28:12 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-06-20 11:26:44 -0700 |
| commit | d658216276431733c94d7b0c16a38b12e58dba0d (patch) | |
| tree | 33cdd29cb39d55791f863e237397d6c479034ba6 /vp9 | |
| parent | 6d2ebfabb102c948dfc5126169264e5512518577 (diff) | |
| download | libvpx-d658216276431733c94d7b0c16a38b12e58dba0d.tar libvpx-d658216276431733c94d7b0c16a38b12e58dba0d.tar.gz libvpx-d658216276431733c94d7b0c16a38b12e58dba0d.tar.bz2 libvpx-d658216276431733c94d7b0c16a38b12e58dba0d.zip | |
Don't return value for void functions
Clears "warning: 'return' with a value, in function returning void"
Change-Id: I93972610d67e243ec772a1021d2fdfcfc689c8c2
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/common/arm/neon/vp9_convolve_neon.c | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/vp9/common/arm/neon/vp9_convolve_neon.c b/vp9/common/arm/neon/vp9_convolve_neon.c index d8b24bfaf..f0881b5ae 100644 --- a/vp9/common/arm/neon/vp9_convolve_neon.c +++ b/vp9/common/arm/neon/vp9_convolve_neon.c @@ -25,12 +25,14 @@ void vp9_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, // Account for the vertical phase needing 3 lines prior and 4 lines post int intermediate_height = h + 7; - if (x_step_q4 != 16 || y_step_q4 != 16) - return vp9_convolve8_c(src, src_stride, - dst, dst_stride, - filter_x, x_step_q4, - filter_y, y_step_q4, - w, h); + if (x_step_q4 != 16 || y_step_q4 != 16) { + vp9_convolve8_c(src, src_stride, + dst, dst_stride, + filter_x, x_step_q4, + filter_y, y_step_q4, + w, h); + return; + } /* Filter starting 3 lines back. The neon implementation will ignore the * given height and filter a multiple of 4 lines. Since this goes in to @@ -57,12 +59,14 @@ void vp9_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, DECLARE_ALIGNED_ARRAY(8, uint8_t, temp, 64 * 72); int intermediate_height = h + 7; - if (x_step_q4 != 16 || y_step_q4 != 16) - return vp9_convolve8_avg_c(src, src_stride, - dst, dst_stride, - filter_x, x_step_q4, - filter_y, y_step_q4, - w, h); + if (x_step_q4 != 16 || y_step_q4 != 16) { + vp9_convolve8_avg_c(src, src_stride, + dst, dst_stride, + filter_x, x_step_q4, + filter_y, y_step_q4, + w, h); + return; + } /* This implementation has the same issues as above. In addition, we only want * to average the values after both passes. |