commit 1ec433df4e38d4fbf1ddd873f5ac809772dd9990
author Jingning Han <jingning@google.com> Sat Sep 23 10:43:42 2017 -0700
committer Jingning Han <jingning@google.com> Sun Sep 24 02:21:24 2017 +0000
tree e03447e974b6533d26384978f3128b33eb996a81
parent 6f3c898f5dd60d0560f5f298320a7ef5a1245554

Fix compiler errors in ext-inter / wedge

Change-Id: I88e425c55b61629430078e11b5b94bac164d027e

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 0ff8cd3..b4d5a7e 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -1887,6 +1887,7 @@
             && mbmi->motion_mode == SIMPLE_TRANSLATION
 #endif  // CONFIG_MOTION_VAR || CONFIG_WARPED_MOTION
             ) {
+#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
 #if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT
           if (is_interinter_compound_used(COMPOUND_WEDGE, bsize)) {
 #endif
@@ -1897,6 +1898,7 @@
 #if CONFIG_WEDGE && CONFIG_COMPOUND_SEGMENT
           }
 #endif
+#endif  // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
         }
 #endif  // CONFIG_EXT_INTER
       }

av1/encoder/rd.c

diff --git a/av1/encoder/rd.c b/av1/encoder/rd.c
index f66ac05..edc185d 100644
--- a/av1/encoder/rd.c
+++ b/av1/encoder/rd.c
@@ -296,9 +296,11 @@
     for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
       av1_cost_tokens_from_cdf(x->inter_compound_mode_cost[i],
                                fc->inter_compound_mode_cdf[i], NULL);
+#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
     for (i = 0; i < BLOCK_SIZES_ALL; ++i)
       av1_cost_tokens_from_cdf(x->compound_type_cost[i],
                                fc->compound_type_cdf[i], NULL);
+#endif  // CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
 #if CONFIG_COMPOUND_SINGLEREF
     for (i = 0; i < INTER_MODE_CONTEXTS; ++i)
       av1_cost_tokens_from_cdf(x->inter_singleref_comp_mode_cost[i],