commit ed29ea2be99230d01a1b531bcc7ccf64714dbaa7
author Zoe Liu <zoeliu@google.com> Thu Apr 20 16:48:15 2017 -0700
committer Zoe Liu <zoeliu@google.com> Fri Apr 21 03:15:26 2017 +0000
tree 7b10986944f17c24d8beee3b3c740c44e9ec2f85
parent 06c372d0118c783222bce26eee267e4cd645c729

A small code clean on ext-inter

BUG=aomedia:442

Change-Id: I5cec560e427bf8628cbaae85aea4cdb19b74659f

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index b42558a..327748e 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -8677,14 +8677,8 @@
   }
   for (i = 0; i < is_comp_pred + 1; ++i) {
     cur_mv[i] = frame_mv[refs[i]];
-// Clip "next_nearest" so that it does not extend to far out of image
-#if CONFIG_EXT_INTER
-    if (this_mode != NEWMV)
-#else
-    if (this_mode != NEWMV)
-#endif  // CONFIG_EXT_INTER
-      clamp_mv2(&cur_mv[i].as_mv, xd);
-
+    // Clip "next_nearest" so that it does not extend to far out of image
+    if (this_mode != NEWMV) clamp_mv2(&cur_mv[i].as_mv, xd);
     if (mv_check_bounds(x, &cur_mv[i].as_mv)) return INT64_MAX;
     mbmi->mv[i].as_int = cur_mv[i].as_int;
   }