ref: 3c021e1d79704d270c0b42d018166b119964fcff
parent: bcee56bed574e614c51df94010449b939fddca17
parent: 921ffdd2c98598064a2c285a033ffd6d528810f3
author: James Berry <jamesberry@google.com>
date: Wed Mar 21 08:36:40 EDT 2012
Merge "bug fix: remove inline from mfqe.c"
--- 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 @@
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)
{--
⑨