commit 9b1c1b7963a67bcdca69c239c1c0b5c07e06c18b
author Yaowu Xu <yaowu@google.com> Sun Mar 18 14:12:34 2018 -0700
committer Yaowu Xu <yaowu@google.com> Tue Mar 20 00:24:00 2018 +0000
tree b7ab36b32191e8d2669a9928514300de5ad86054
parent 692669f9f59cd4b25c8453796915d997c89a5f1e

Fix msvc build error

Change-Id: I8a471c94539ed6258b034734f470194715b57218

av1/encoder/encodemb.c

diff --git a/av1/encoder/encodemb.c b/av1/encoder/encodemb.c
index 131ee1d..bc41c2b 100644
--- a/av1/encoder/encodemb.c
+++ b/av1/encoder/encodemb.c
@@ -546,11 +546,15 @@
   if (*eob == 0 && plane == 0) {
     const int txk_type_idx =
         av1_get_txk_type_index(plane_bsize, blk_row, blk_col);
-    assert(args->cpi->oxcf.aq_mode != NO_AQ ||
 #if CONFIG_EXT_DELTA_Q
+    assert(args->cpi->oxcf.aq_mode != NO_AQ ||
            args->cpi->oxcf.deltaq_mode != NO_DELTA_Q ||
-#endif
            xd->mi[0]->mbmi.txk_type[txk_type_idx] == DCT_DCT);
+#else
+    assert(args->cpi->oxcf.aq_mode != NO_AQ ||
+           xd->mi[0]->mbmi.txk_type[txk_type_idx] == DCT_DCT);
+#endif
+
     xd->mi[0]->mbmi.txk_type[txk_type_idx] = DCT_DCT;
   }