From: Debargha Mukherjee <debargha@google.com>
Date: Tue, 26 Jan 2016 01:13:26 +0000 (-0800)
Subject: A minor assert fix for supertx
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8122bb9577f337c57fb0dbe5dc522ceb2ce15a3;p=libvpx

A minor assert fix for supertx

Change-Id: I532fff64ccaa1f38240ba7ca5ce2f7e1eb531771
---

diff --git a/vp10/encoder/bitstream.c b/vp10/encoder/bitstream.c
index 691fc51c1..91fb506cf 100644
--- 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
 }