commit 70539b10d90d6dfd8898605e68c3faffe1975120
author Zoe Liu <zoeliu@google.com> Sat Dec 02 19:03:36 2017 -0800
committer Zoe Liu <zoeliu@google.com> Wed Dec 06 20:12:54 2017 +0000
tree 3159e58419da39ae52517eff5c497f38c4411b83
parent 5f11e91520ed780362fce2010469f083f812c71b

Remove redundant check on single ref for motion mode

Change-Id: Ia8321afd087f99371cdf07f3a03249580e09964d

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index cf46f43..c9b54ba 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -1259,7 +1259,8 @@
       is_inter_mode(mbmi->mode) && mbmi->ref_frame[1] != INTRA_FRAME &&
       is_motion_variation_allowed_compound(mbmi)) {
     if (!check_num_overlappable_neighbors(mbmi)) return SIMPLE_TRANSLATION;
-    if (!has_second_ref(mbmi) && mbmi->num_proj_ref[0] >= 1 &&
+    assert(!has_second_ref(mbmi));
+    if (mbmi->num_proj_ref[0] >= 1 &&
         !av1_is_scaled(&(xd->block_refs[0]->sf))) {
 #if CONFIG_AMVR
       if (xd->cur_frame_force_integer_mv) {