diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2016-01-14 13:36:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-01-14 13:36:40 +0000 |
| commit | d4bc17d6966ea779e6d0423d671969cd0417994d (patch) | |
| tree | 5fd23d18124835c09d5828245eb3c680e2889f3d /vp9/encoder/vp9_mcomp.c | |
| parent | 13177d7ecb036c074cc180414a40d4a042794d46 (diff) | |
| parent | de993a847f8080d3128420c8ef8495642013bdb1 (diff) | |
| download | libvpx-d4bc17d6966ea779e6d0423d671969cd0417994d.tar libvpx-d4bc17d6966ea779e6d0423d671969cd0417994d.tar.gz libvpx-d4bc17d6966ea779e6d0423d671969cd0417994d.tar.bz2 libvpx-d4bc17d6966ea779e6d0423d671969cd0417994d.zip | |
Merge "VP9: inline vp9_use_mv_hp()"
Diffstat (limited to 'vp9/encoder/vp9_mcomp.c')
| -rw-r--r-- | vp9/encoder/vp9_mcomp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_mcomp.c b/vp9/encoder/vp9_mcomp.c index a84202bb4..eab07bccb 100644 --- a/vp9/encoder/vp9_mcomp.c +++ b/vp9/encoder/vp9_mcomp.c @@ -439,7 +439,7 @@ int vp9_find_best_sub_pixel_tree_pruned_evenmore( tr = br; tc = bc; - if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) { + if (allow_hp && use_mv_hp(ref_mv) && forced_stop == 0) { hstep >>= 1; FIRST_LEVEL_CHECKS; if (eighthiters > 1) { @@ -507,7 +507,7 @@ int vp9_find_best_sub_pixel_tree_pruned_more(const MACROBLOCK *x, } } - if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) { + if (allow_hp && use_mv_hp(ref_mv) && forced_stop == 0) { tr = br; tc = bc; hstep >>= 1; @@ -602,7 +602,7 @@ int vp9_find_best_sub_pixel_tree_pruned(const MACROBLOCK *x, tc = bc; } - if (allow_hp && vp9_use_mv_hp(ref_mv) && forced_stop == 0) { + if (allow_hp && use_mv_hp(ref_mv) && forced_stop == 0) { hstep >>= 1; FIRST_LEVEL_CHECKS; if (eighthiters > 1) { @@ -674,7 +674,7 @@ int vp9_find_best_sub_pixel_tree(const MACROBLOCK *x, unsigned int cost_array[5]; int kr, kc; - if (!(allow_hp && vp9_use_mv_hp(ref_mv))) + if (!(allow_hp && use_mv_hp(ref_mv))) if (round == 3) round = 2; |