diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-06 12:45:28 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-02-06 16:12:56 -0800 |
| commit | aac73df1a7b2e84e1930fa63ac6d7983cfdba543 (patch) | |
| tree | c9bf85c7aabdde05d3f8e221605fc4ec84c7e86c /vp9/encoder/vp9_rdopt.c | |
| parent | a788e0fe63e90dca31c67c6ddc21658f86d8a49a (diff) | |
| download | libvpx-aac73df1a7b2e84e1930fa63ac6d7983cfdba543.tar libvpx-aac73df1a7b2e84e1930fa63ac6d7983cfdba543.tar.gz libvpx-aac73df1a7b2e84e1930fa63ac6d7983cfdba543.tar.bz2 libvpx-aac73df1a7b2e84e1930fa63ac6d7983cfdba543.zip | |
Use configure checks for various inline keywords.
Change-Id: I8508f1a3d3430f998bb9295f849e88e626a52a24
Diffstat (limited to 'vp9/encoder/vp9_rdopt.c')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index 89707a260..2868db55f 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -2368,8 +2368,7 @@ typedef struct { } BEST_SEG_INFO; -static __inline -int mv_check_bounds(MACROBLOCK *x, int_mv *mv) { +static INLINE int mv_check_bounds(MACROBLOCK *x, int_mv *mv) { int r = 0; r |= (mv->as_mv.row >> 3) < x->mv_row_min; r |= (mv->as_mv.row >> 3) > x->mv_row_max; @@ -2744,7 +2743,7 @@ static void rd_check_segment(VP9_COMP *cpi, MACROBLOCK *x, } } -static __inline void cal_step_param(int sr, int *sp) { +static INLINE void cal_step_param(int sr, int *sp) { int step = 0; if (sr > MAX_FIRST_STEP) sr = MAX_FIRST_STEP; @@ -3011,7 +3010,8 @@ static void estimate_curframe_refprobs(VP9_COMP *cpi, vp9_prob mod_refprobs[3], } } -static __inline unsigned weighted_cost(vp9_prob *tab0, vp9_prob *tab1, int idx, int val, int weight) { +static INLINE unsigned weighted_cost(vp9_prob *tab0, vp9_prob *tab1, + int idx, int val, int weight) { unsigned cost0 = tab0[idx] ? vp9_cost_bit(tab0[idx], val) : 0; unsigned cost1 = tab1[idx] ? vp9_cost_bit(tab1[idx], val) : 0; // weight is 16-bit fixed point, so this basically calculates: |