From a8122bb9577f337c57fb0dbe5dc522ceb2ce15a3 Mon Sep 17 00:00:00 2001 From: Debargha Mukherjee Date: Mon, 25 Jan 2016 17:13:26 -0800 Subject: [PATCH] A minor assert fix for supertx Change-Id: I532fff64ccaa1f38240ba7ca5ce2f7e1eb531771 --- vp10/encoder/bitstream.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) 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 } -- 2.40.0