]> granicus.if.org Git - libvpx/commitdiff
A minor assert fix for supertx
authorDebargha Mukherjee <debargha@google.com>
Tue, 26 Jan 2016 01:13:26 +0000 (17:13 -0800)
committerDebargha Mukherjee <debargha@google.com>
Tue, 26 Jan 2016 01:15:51 +0000 (17:15 -0800)
Change-Id: I532fff64ccaa1f38240ba7ca5ce2f7e1eb531771

vp10/encoder/bitstream.c

index 691fc51c183f47bc6904fdd71007975e4a8c7b13..91fb506cf92015f7063591abef734b84210b15bd 100644 (file)
@@ -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
 }