A minor assert fix for supertx

Change-Id: I532fff64ccaa1f38240ba7ca5ce2f7e1eb531771

A minor assert fix for supertx
Change-Id: I532fff64ccaa1f38240ba7ca5ce2f7e1eb531771
a8122bb9 · Debargha Mukherjee · 3e63170f · a8122bb9
Commit a8122bb9 authored Jan 25, 2016 by Debargha Mukherjee
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

vp10/encoder/bitstream.c vp10/encoder/bitstream.c +6 -2

No files found.
--- a/vp10/encoder/bitstream.c
+++ b/vp10/encoder/bitstream.c
@@ -1124,8 +1124,12 @@ static void pack_inter_mode_mvs(VP10_COMP *cpi, const MODE_INFO *mi,
          &ext_tx_encodings[mbmi->tx_type]);
    }
  } else {
-    if (!mbmi->skip)
-      assert(mbmi->tx_type == DCT_DCT);
+    if (!mbmi->skip) {
+#if CONFIG_SUPERTX
+      if (!supertx_enabled)
+#endif  // CONFIG_SUPERTX
+        assert(mbmi->tx_type == DCT_DCT);
+    }
  }
 #endif  // CONFIG_EXT_TX
 }