commit ab8bf50892b9961c48e94cb3ac6ef023e54f0f38
author Debargha Mukherjee <debargha@google.com> Thu Oct 05 09:10:39 2017 -0700
committer Debargha Mukherjee <debargha@google.com> Fri Oct 06 00:47:36 2017 +0000
tree 577b93d39ad6ff08d0aacae0f478ed82e0b2093f
parent 0d9888bda07825ab2784b6d8b14f412aaa8ebcd7

Fix compile conflict w/ unpoison-partition-context

Fixes compile failures with unpoison-partition-context and
ext-partition-types.

Change-Id: Ibedab7d927d6bf7329a5fc5a3050aa6272d4b254

av1/encoder/encodeframe.c

diff --git a/av1/encoder/encodeframe.c b/av1/encoder/encodeframe.c
index 71d3e33..c961222 100644
--- a/av1/encoder/encodeframe.c
+++ b/av1/encoder/encodeframe.c
@@ -3350,6 +3350,12 @@
   MACROBLOCK *const x = &td->mb;
   MACROBLOCKD *const xd = &x->e_mbd;
   RD_STATS sum_rdc, this_rdc;
+#if CONFIG_UNPOISON_PARTITION_CTX
+  const AV1_COMMON *const cm = &cpi->common;
+  const int hbs = mi_size_wide[bsize] / 2;
+  const int has_rows = mi_row + hbs < cm->mi_rows;
+  const int has_cols = mi_col + hbs < cm->mi_cols;
+#endif  // CONFIG_UNPOISON_PARTITION_CTX
 #if CONFIG_SUPERTX || CONFIG_EXT_PARTITION_TYPES_AB
   const AV1_COMMON *const cm = &cpi->common;
 #endif