commit e2746e30b95d78e3c0a467c969232341ea897dc6
author Alex Converse <aconverse@google.com> Fri Feb 03 15:23:24 2017 -0800
committer Alex Converse <aconverse@google.com> Sat Feb 04 01:02:18 2017 +0000
tree 7118b0f584a3d187ef6e42ae8732d619e670d21d
parent 7b9f2b3b0d44280cd3ff3cc3461ea6600f3f171d

entropy: Fix --disable-ec_multisymbol build

Broken by I233979909118241a0c78761c1d5c2cd6857915e0

Change-Id: I3af0d3907f63b69c1301a48e7d2a276c52d3fd00

av1/encoder/tokenize.c

diff --git a/av1/encoder/tokenize.c b/av1/encoder/tokenize.c
index 8233d2b..a62604d 100644
--- a/av1/encoder/tokenize.c
+++ b/av1/encoder/tokenize.c
@@ -474,13 +474,14 @@
 #if CONFIG_ENTROPY
   const aom_prob(*coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
       cpi->subframe_stats.coef_probs_buf[cpi->common.coef_probs_update_idx]
+                                        [txsize_sqr_map[tx_size]][type][ref];
 #else
   aom_prob(*const coef_probs)[COEFF_CONTEXTS][UNCONSTRAINED_NODES] =
       cpi->common.fc->coef_probs[txsize_sqr_map[tx_size]][type][ref];
 #endif  // CONFIG_ENTROPY
 #endif
 #if CONFIG_EC_ADAPT
-      FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+  FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
 #elif CONFIG_EC_MULTISYMBOL
   FRAME_CONTEXT *ec_ctx = cpi->common.fc;
 #endif