commit 8c113ea88bc5afc1d5d7001c8dedbde7af2c82dc
author Wan-Teh Chang <wtc@google.com> Sat Jun 20 08:36:07 2020 -0700
committer Wan-Teh Chang <wtc@google.com> Sat Jun 20 08:40:13 2020 -0700
tree 0689777013b287359f0ed2f7e304657ae3cac21d
parent 2b9242ac416715fe335c133fc5b032bcd558035b

Do not use #if inside assert()

Fix the Visual C++ compilation errors:
aom\av1\encoder\ratectrl.c(1024,1): error C2121: '#': invalid character:
possibly the result of a macro expansion [build\aom_av1_encoder.vcxproj]
av1\encoder\ratectrl.c(1024,1): error C2059: syntax error: 'if'
[build\aom_av1_encoder.vcxproj]

Change-Id: Ifcdddc18513e5b5e9afbf682bfa9bc9c53ca056c

av1/encoder/ratectrl.c

diff --git a/av1/encoder/ratectrl.c b/av1/encoder/ratectrl.c
index 99f02ea..8307750 100644
--- a/av1/encoder/ratectrl.c
+++ b/av1/encoder/ratectrl.c
@@ -1018,9 +1018,7 @@
 
   assert(has_no_stats_stage(cpi));
   assert(rc_mode == AOM_VBR ||
-#if !USE_UNRESTRICTED_Q_IN_CQ_MODE
-         rc_mode == AOM_CQ ||
-#endif  // !USE_UNRESTRICTED_Q_IN_CQ_MODE
+         (!USE_UNRESTRICTED_Q_IN_CQ_MODE && rc_mode == AOM_CQ) ||
          rc_mode == AOM_Q);
   assert(
       IMPLIES(rc_mode == AOM_Q, gf_group->update_type[gf_index] == ARF_UPDATE));