commit 5f0cb5ebec0b07caedebca1d1aa97204342ab08e
author Angie Chiang <angiebird@google.com> Mon Dec 11 16:07:50 2017 -0800
committer Angie Chiang <angiebird@google.com> Mon Dec 11 16:11:58 2017 -0800
tree b09400222c06bb60fe77a5a53fad5946a27680ef
parent 1757fb61008a4b6c6fe1aa1dc11158aba3608fcb

Put tx_type check into txk_sel config

Change-Id: I47a5eda017fe0d2592411eab621934eabeae7aa4

av1/encoder/encodetxb.c

diff --git a/av1/encoder/encodetxb.c b/av1/encoder/encodetxb.c
index f79981d..2576333 100644
--- a/av1/encoder/encodetxb.c
+++ b/av1/encoder/encodetxb.c
@@ -340,9 +340,11 @@
   (void)blk_col;
   aom_write_bin(w, eob == 0,
                 ec_ctx->txb_skip_cdf[txs_ctx][txb_ctx->txb_skip_ctx], 2);
+#if CONFIG_TXK_SEL
   if (plane == 0 && eob == 0) {
     assert(tx_type == DCT_DCT);
   }
+#endif
   if (eob == 0) return;
 
   av1_txb_init_levels(tcoeff, width, height, levels);