Fix an assertion condition in transform type search

Change-Id: I442475e559be2acdc1c2a3e5ca021b3de77adda5

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index 193bc45c36f8686604ec60933eb1942852970134..de735e5318f1661493965494e91889b161de1ea5 100644 (file)
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -1285,8 +1285,12 @@ static void choose_tx_size_from_rd(VP10_COMP *cpi, MACROBLOCK *x,
 
   mbmi->tx_size = best_tx;
   mbmi->tx_type = best_tx_type;
+
+#if !CONFIG_EXT_TX
   if (mbmi->tx_size >= TX_32X32)
     assert(mbmi->tx_type == DCT_DCT);
+#endif
+
   txfm_rd_in_plane(x,
                    cpi,
                    &r, &d, &s,