From 7ea431df98c018e5b1a9ad68a92837cb3375f6ca Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 12 Jun 2015 17:56:33 -0700 Subject: vp9_mcomp: don't mark setup_center_error() inline this function is a bit too involved for the hint; avoids a -Winline warning Change-Id: Ib82e424764aa78b37ddb94116e2b009a6de31d35 --- vp9/encoder/vp9_mcomp.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'vp9/encoder/vp9_mcomp.c') diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 234272697..50983743a 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -286,20 +286,20 @@ static INLINE const uint8_t *pre(const uint8_t *buf, int stride, int r, int c) { bestmv->row *= 8; \ bestmv->col *= 8; -static INLINE unsigned int setup_center_error(const MACROBLOCKD *xd, - const MV *bestmv, - const MV *ref_mv, - int error_per_bit, - const vp9_variance_fn_ptr_t *vfp, - const uint8_t *const src, - const int src_stride, - const uint8_t *const y, - int y_stride, - const uint8_t *second_pred, - int w, int h, int offset, - int *mvjcost, int *mvcost[2], - unsigned int *sse1, - int *distortion) { +static unsigned int setup_center_error(const MACROBLOCKD *xd, + const MV *bestmv, + const MV *ref_mv, + int error_per_bit, + const vp9_variance_fn_ptr_t *vfp, + const uint8_t *const src, + const int src_stride, + const uint8_t *const y, + int y_stride, + const uint8_t *second_pred, + int w, int h, int offset, + int *mvjcost, int *mvcost[2], + unsigned int *sse1, + int *distortion) { unsigned int besterr; #if CONFIG_VP9_HIGHBITDEPTH if (second_pred != NULL) { -- cgit v1.2.3 From aaa49f04854737a5f7c18ea844da1ca89694e5de Mon Sep 17 00:00:00 2001 From: James Zern Date: Fri, 12 Jun 2015 18:11:54 -0700 Subject: vp9_mcomp: make search_step_table static Change-Id: I2552d8101cf49ed951782ab69adce407579700fc --- vp9/encoder/vp9_mcomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'vp9/encoder/vp9_mcomp.c') diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index 50983743a..081b99f9f 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -610,7 +610,7 @@ int vp9_find_best_sub_pixel_tree_pruned(const MACROBLOCK *x, return besterr; } -const MV search_step_table[12] = { +static const MV search_step_table[12] = { // left, right, up, down {0, -4}, {0, 4}, {-4, 0}, {4, 0}, {0, -2}, {0, 2}, {-2, 0}, {2, 0}, -- cgit v1.2.3