diff options
author | James Berry <jamesberry@google.com> | 2012-03-21 12:36:40 -0700 |
---|---|---|
committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-03-21 12:36:40 -0700 |
commit | 3c021e1d79704d270c0b42d018166b119964fcff (patch) | |
tree | cd68c1e3d0fffaef6c22829fd3f3ade670007a55 | |
parent | bcee56bed574e614c51df94010449b939fddca17 (diff) | |
parent | 921ffdd2c98598064a2c285a033ffd6d528810f3 (diff) | |
download | libvpx-3c021e1d79704d270c0b42d018166b119964fcff.tar libvpx-3c021e1d79704d270c0b42d018166b119964fcff.tar.gz libvpx-3c021e1d79704d270c0b42d018166b119964fcff.tar.bz2 libvpx-3c021e1d79704d270c0b42d018166b119964fcff.zip |
Merge "bug fix: remove inline from mfqe.c"
-rw-r--r-- | vp8/common/mfqe.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/vp8/common/mfqe.c b/vp8/common/mfqe.c index 05d95395b..84e336915 100644 --- a/vp8/common/mfqe.c +++ b/vp8/common/mfqe.c @@ -27,9 +27,9 @@ #include <stdlib.h> -static inline void filter_by_weight(unsigned char *src, int src_stride, - unsigned char *dst, int dst_stride, - int block_size, int src_weight) +static void filter_by_weight(unsigned char *src, int src_stride, + unsigned char *dst, int dst_stride, + int block_size, int src_weight) { int dst_weight = (1 << MFQE_PRECISION) - src_weight; int rounding_bit = 1 << (MFQE_PRECISION - 1); @@ -69,18 +69,18 @@ void vp8_filter_by_weight4x4_c(unsigned char *src, int src_stride, filter_by_weight(src, src_stride, dst, dst_stride, 4, src_weight); } -static inline void apply_ifactor(unsigned char *y_src, - int y_src_stride, - unsigned char *y_dst, - int y_dst_stride, - unsigned char *u_src, - unsigned char *v_src, - int uv_src_stride, - unsigned char *u_dst, - unsigned char *v_dst, - int uv_dst_stride, - int block_size, - int src_weight) +static void apply_ifactor(unsigned char *y_src, + int y_src_stride, + unsigned char *y_dst, + int y_dst_stride, + unsigned char *u_src, + unsigned char *v_src, + int uv_src_stride, + unsigned char *u_dst, + unsigned char *v_dst, + int uv_dst_stride, + int block_size, + int src_weight) { if (block_size == 16) { |