commit 45295c353634f4fef25cc6ad1e69bdeeaf951a70
author Yaowu Xu <yaowu@google.com> Thu Mar 29 12:06:10 2018 -0700
committer Yaowu Xu <yaowu@google.com> Thu Mar 29 22:31:34 2018 +0000
tree 879f30bdb85df6182518906db60f7d16fc15254e
parent 93b047e55595d65c30e0d7e18fcb02043020c078

Remove CONFIG_AMVR

This tool is fully adopted.

Change-Id: Ia98710ba1e1cb0a06f937316521d8139a7b1f5f6

av1/encoder/mcomp.c

diff --git a/av1/encoder/mcomp.c b/av1/encoder/mcomp.c
index e8881cb..69b28ec 100644
--- a/av1/encoder/mcomp.c
+++ b/av1/encoder/mcomp.c
@@ -3145,13 +3145,9 @@
   bestmv->row = maxr;
   bestmv->col = maxc;
   besterr = 0;
-// In the sub-pel motion search, if hp is not used, then the last bit of mv
-// has to be 0.
-#if CONFIG_AMVR
+  // In the sub-pel motion search, if hp is not used, then the last bit of mv
+  // has to be 0.
   lower_mv_precision(bestmv, allow_hp, 0);
-#else
-  lower_mv_precision(bestmv, allow_hp);
-#endif
   return besterr;
 }
 // Return the minimum MV.
@@ -3173,12 +3169,8 @@
   bestmv->row = minr;
   bestmv->col = minc;
   besterr = 0;
-// In the sub-pel motion search, if hp is not used, then the last bit of mv
-// has to be 0.
-#if CONFIG_AMVR
+  // In the sub-pel motion search, if hp is not used, then the last bit of mv
+  // has to be 0.
   lower_mv_precision(bestmv, allow_hp, 0);
-#else
-  lower_mv_precision(bestmv, allow_hp);
-#endif
   return besterr;
 }