commit 64a2fb87c1c481ee29163a515e03c3f563f0a390
author Angie Chiang <angiebird@google.com> Thu Jul 06 10:15:16 2017 -0700
committer Angie Chiang <angiebird@google.com> Thu Jul 06 19:17:11 2017 +0000
tree 194faa1c17d46577873d633da2444b7ca1e9c287
parent 8c08a33a418328e3c22ac11346ecc15d3a6a2ee6

Fix compiler bug of interintra exp

Change-Id: I599b57141d58b62a56bf884d7d50d1b6ebfd8b67

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e047247..12b04c8 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -2209,7 +2209,8 @@
   return 0;
 }
 
-#if CONFIG_EXT_INTER && (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT)
+#if CONFIG_EXT_INTER && \
+    (CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT || CONFIG_INTERINTRA)
 static int64_t estimate_yrd_for_sb(const AV1_COMP *const cpi, BLOCK_SIZE bs,
                                    MACROBLOCK *x, int *r, int64_t *d, int *s,
                                    int64_t *sse, int64_t ref_best_rd) {
@@ -8239,7 +8240,7 @@
   int rate_mv = 0;
 #if CONFIG_EXT_INTER
   int pred_exists = 1;
-#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
+#if CONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT || CONFIG_INTERINTRA
   const int bw = block_size_wide[bsize];
 #endif  // ONFIG_WEDGE || CONFIG_COMPOUND_SEGMENT
   int_mv single_newmv[TOTAL_REFS_PER_FRAME];