commit 2b0eeb16b1104b917aa1d9136f6b1c8ca3571d3a
author Jingning Han <jingning@google.com> Thu Feb 23 15:55:37 2017 -0800
committer Jingning Han <jingning@google.com> Thu Feb 23 15:57:11 2017 -0800
tree e50938faa4885a911ebc3b086027e4f64916f40c
parent 1857cfa1e8f560c787995ba3f6ff40a89be46256

Fix a compiling error in ext-tx and var-tx

Change-Id: Icd4cd42b1b9fa9066cda3e33e487298c8d802546

av1/encoder/rdopt.c

diff --git a/av1/encoder/rdopt.c b/av1/encoder/rdopt.c
index e91a50d..0484479 100644
--- a/av1/encoder/rdopt.c
+++ b/av1/encoder/rdopt.c
@@ -4186,6 +4186,7 @@
 static void select_tx_type_yrd(const AV1_COMP *cpi, MACROBLOCK *x,
                                RD_STATS *rd_stats, BLOCK_SIZE bsize,
                                int64_t ref_best_rd) {
+  const AV1_COMMON *cm = &cpi->common;
   const TX_SIZE max_tx_size = max_txsize_lookup[bsize];
   MACROBLOCKD *const xd = &x->e_mbd;
   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;
@@ -4200,8 +4201,8 @@
   const int n4 = 1 << (num_pels_log2_lookup[bsize] - 2 * tx_size_wide_log2[0]);
   int idx, idy;
   int prune = 0;
-  const int count32 = 1 << (2 * (cpi->common.mib_size_log2 -
-                                 mi_width_log2_lookup[BLOCK_32X32]));
+  const int count32 =
+      1 << (2 * (cm->mib_size_log2 - mi_width_log2_lookup[BLOCK_32X32]));
 #if CONFIG_EXT_PARTITION
   RD_STATS rd_stats_stack[16];
 #else