commit b7e72f38d3b931534e238c43329d2daafbbdb8fc
author Thomas Daede <tdaede@mozilla.com> Wed Apr 26 13:40:31 2017 -0700
committer Thomas Daede <tdaede@mozilla.com> Thu Apr 27 18:36:57 2017 +0000
tree 0627117a36612c239f5af3292294acacb9b630d7
parent 0617363b83817c4464fddb781ceac5240b254189

Cleanup unused variable with ext-tx experiment.

BUG=aomedia:446

Change-Id: I85433af2295c9610184ab5df812eabd8522689f6

av1/common/blockd.h

diff --git a/av1/common/blockd.h b/av1/common/blockd.h
index fc1958b..4005d88 100644
--- a/av1/common/blockd.h
+++ b/av1/common/blockd.h
@@ -972,7 +972,9 @@
   const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
   return get_default_tx_type(plane_type, xd, block_raster_idx, tx_size);
 #elif CONFIG_EXT_TX
+#if !CONFIG_CB4X4
   const int block_raster_idx = av1_block_index_to_raster_order(tx_size, block);
+#endif  // !CONFIG_CB4X4
   if (xd->lossless[mbmi->segment_id] || txsize_sqr_map[tx_size] > TX_32X32 ||
       (txsize_sqr_map[tx_size] >= TX_32X32 && !is_inter_block(mbmi)))
     return DCT_DCT;
@@ -996,11 +998,12 @@
   }
 
 #if CONFIG_CB4X4
+  (void)block;
   if (tx_size < TX_4X4)
     return DCT_DCT;
   else
     return intra_mode_to_tx_type_context[mbmi->uv_mode];
-#endif
+#else
 
   // Sub8x8-Inter/Intra OR UV-Intra
   if (is_inter_block(mbmi))  // Sub8x8-Inter
@@ -1009,6 +1012,7 @@
     return intra_mode_to_tx_type_context[plane_type == PLANE_TYPE_Y
                                              ? get_y_mode(mi, block_raster_idx)
                                              : mbmi->uv_mode];
+#endif  // CONFIG_CB4X4
 #else   // CONFIG_EXT_TX
   (void)block;
   if (plane_type != PLANE_TYPE_Y || xd->lossless[mbmi->segment_id] ||