commit 41a36ded53522466a03458fb6d37d9fcc97ff4ce
author Yaowu Xu <yaowu@google.com> Thu Mar 23 15:55:03 2017 -0700
committer Yaowu Xu <yaowu@google.com> Fri Mar 24 17:27:39 2017 +0000
tree c75aa415080b34eb3166ab780449ce67025c6e27
parent 1f89d0f880479789eb71bcad50848a8e546e31a4

Fix compiling for supertx

Change-Id: I0a067e89d544f72d7ce08b0e4cccb77c4c3c9497

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 72c9068..544c3f1 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2690,6 +2690,7 @@
     int skip;
     const int bsw = mi_size_wide[bsize];
     const int bsh = mi_size_high[bsize];
+
     xd->mi = cm->mi_grid_visible + mi_offset;
     supertx_size = mbmi->tx_size;
 #if CONFIG_DEPENDENT_HORZTILES
@@ -2711,6 +2712,11 @@
           get_ext_tx_set(supertx_size, bsize, 1, cm->reduced_tx_set_used);
       if (eset > 0) {
 #if CONFIG_EC_MULTISYMBOL
+#if CONFIG_EC_ADAPT
+        FRAME_CONTEXT *ec_ctx = xd->tile_ctx;
+#else
+        FRAME_CONTEXT *ec_ctx = cm->fc;
+#endif
         aom_write_symbol(w, av1_ext_tx_inter_ind[eset][mbmi->tx_type],
                          ec_ctx->inter_ext_tx_cdf[eset][supertx_size],
                          ext_tx_cnt_inter[eset]);