Merge "Fix an assertion condition in transform type search" into nextgenv2

vp10/encoder/rdopt.c

diff --git a/vp10/encoder/rdopt.c b/vp10/encoder/rdopt.c
index ba864e4..4dad329 100644
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -1423,8 +1423,12 @@
 
   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,