commit c5f735f9b157e7b040c1ad702f72508d885cafb6
author Debargha Mukherjee <debargha@google.com> Wed Apr 26 03:25:28 2017 +0000
committer Debargha Mukherjee <debargha@google.com> Wed Apr 26 14:37:12 2017 +0000
tree 3f77a614028da043999cb85e6993ad2afe8c7b95
parent 9b18037314965801bf3e3de4112fda0e4eff485c

Fix separation between ext-inter group of expts.

Change-Id: I9b6f99768c60e743d2fadfaabc532e7c15dc40f3

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index ec3b975..bbcfe9e 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -203,15 +203,24 @@
 }
 
 static INLINE int use_masked_motion_search(COMPOUND_TYPE type) {
+#if CONFIG_WEDGE
   return (type == COMPOUND_WEDGE);
+#else
+  (void)type;
+  return 0;
+#endif
 }
 
 static INLINE int is_masked_compound_type(COMPOUND_TYPE type) {
-#if CONFIG_COMPOUND_SEGMENT
+#if CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE
   return (type == COMPOUND_WEDGE || type == COMPOUND_SEG);
-#else
+#elif !CONFIG_COMPOUND_SEGMENT && CONFIG_WEDGE
   return (type == COMPOUND_WEDGE);
+#elif CONFIG_COMPOUND_SEGMENT && !CONFIG_WEDGE
+  return (type == COMPOUND_SEG);
 #endif  // CONFIG_COMPOUND_SEGMENT
+  (void)type;
+  return 0;
 }
 #else