commit 6c6ddac3a494b0ed7325dc85416013a7373963f7
author Yue Chen <yuec@google.com> Tue Sep 27 06:46:19 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 27 06:46:19 2016 +0000
tree 18e3365411e6b9c164ccfd6a0a4f98b2ef2fd1ba
parent c8b229772ee89278a225cee2b7d73fa23673a69f
parent a7c814664e3908024c097ddfc11f67997a0558f6

Merge "Fix for compile error with RECT_TX without EXT_TX" into nextgenv2

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index d97e280..6492f62 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -306,14 +306,14 @@
     if (allow_select && tx_mode == TX_MODE_SELECT) {
       const TX_SIZE coded_tx_size =
           read_selected_tx_size(cm, xd, inter_tx_size_cat_lookup[bsize], r);
-#if !CONFIG_RECT_TX
-      assert(coded_tx_size <= max_txsize_lookup[bsize]);
-#else
+#if CONFIG_EXT_TX && CONFIG_RECT_TX
       if (coded_tx_size > max_txsize_lookup[bsize]) {
         assert(coded_tx_size == max_txsize_lookup[bsize] + 1);
         return max_txsize_rect_lookup[bsize];
       }
-#endif  // !CONFIG_RECT_TX
+#else
+      assert(coded_tx_size <= max_txsize_lookup[bsize]);
+#endif  // CONFIG_EXT_TX && CONFIG_RECT_TX
       return coded_tx_size;
     } else {
       return tx_size_from_tx_mode(bsize, cm->tx_mode, 1);