commit 0c634c704b51ba457b1bac219fe2c2d07f4704b4
author Zoe Liu <zoeliu@google.com> Mon Jun 19 07:06:28 2017 -0700
committer Zoe Liu <zoeliu@google.com> Mon Jun 19 16:30:35 2017 +0000
tree 53c04ccdd7442b25cc152433b31e6beb1c26b131
parent db252a43a17b54f9a9e994819b8f9081b123ed7a

Unify the checking on compound mode prediction

Change-Id: Id9c025febf21aeb67cbc719f585661b715bdb9ce

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index 159e18c..246bf4e 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -2498,8 +2498,7 @@
   mbmi->interinter_compound_type = COMPOUND_AVERAGE;
   if (
 #if CONFIG_COMPOUND_SINGLEREF
-      (is_inter_compound_mode(mbmi->mode) ||
-       is_inter_singleref_comp_mode(mbmi->mode))
+      is_inter_anyref_comp_mode(mbmi->mode)
 #else   // !CONFIG_COMPOUND_SINGLEREF
       cm->reference_mode != SINGLE_REFERENCE &&
       is_inter_compound_mode(mbmi->mode)