diff options
| author | James Zern <jzern@google.com> | 2015-08-27 14:46:08 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-08-27 15:31:24 -0700 |
| commit | 820302a394095e3a22ff68c692c56498919118ab (patch) | |
| tree | 64d134bd6e902c31d5a9162d71656581db9fb5fc /vp8/encoder/mcomp.c | |
| parent | 5c245a46d83d54f129f42db1a3bf7b2a2832252b (diff) | |
| download | libvpx-820302a394095e3a22ff68c692c56498919118ab.tar libvpx-820302a394095e3a22ff68c692c56498919118ab.tar.gz libvpx-820302a394095e3a22ff68c692c56498919118ab.tar.bz2 libvpx-820302a394095e3a22ff68c692c56498919118ab.zip | |
vp8: use VPX(MIN|MAX) from vpx_dsp_common.h
remove MIN/MAX defines in vp8/common/common.h
Change-Id: I41520f34af175e05b263ebd12198f4de29a967db
Diffstat (limited to 'vp8/encoder/mcomp.c')
| -rw-r--r-- | vp8/encoder/mcomp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/vp8/encoder/mcomp.c b/vp8/encoder/mcomp.c index f848e8fb5..676dd544d 100644 --- a/vp8/encoder/mcomp.c +++ b/vp8/encoder/mcomp.c @@ -223,14 +223,14 @@ int vp8_find_best_sub_pixel_step_iteratively(MACROBLOCK *x, BLOCK *b, BLOCKD *d, unsigned int quarteriters = 4; int thismse; - int minc = MAX(x->mv_col_min * 4, - (ref_mv->as_mv.col >> 1) - ((1 << mvlong_width) - 1)); - int maxc = MIN(x->mv_col_max * 4, - (ref_mv->as_mv.col >> 1) + ((1 << mvlong_width) - 1)); - int minr = MAX(x->mv_row_min * 4, - (ref_mv->as_mv.row >> 1) - ((1 << mvlong_width) - 1)); - int maxr = MIN(x->mv_row_max * 4, - (ref_mv->as_mv.row >> 1) + ((1 << mvlong_width) - 1)); + int minc = VPXMAX(x->mv_col_min * 4, + (ref_mv->as_mv.col >> 1) - ((1 << mvlong_width) - 1)); + int maxc = VPXMIN(x->mv_col_max * 4, + (ref_mv->as_mv.col >> 1) + ((1 << mvlong_width) - 1)); + int minr = VPXMAX(x->mv_row_min * 4, + (ref_mv->as_mv.row >> 1) - ((1 << mvlong_width) - 1)); + int maxr = VPXMIN(x->mv_row_max * 4, + (ref_mv->as_mv.row >> 1) + ((1 << mvlong_width) - 1)); int y_stride; int offset; |