commit 748d3f5e0f9066c2509a63fb1eab49e179c40c57
author Yaowu Xu <yaowu@google.com> Thu Oct 20 22:29:57 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Oct 20 22:29:57 2016 +0000
tree 5531103e60fb8f842ae6353de4d61568869d9380
parent 6d513778587a6e9f0c7e3d58a9d6c0318c6a9492
parent e28d92be9783d5ff6ecdf8989d1fc4340a759ef4

Merge "Fix Visual Studio build." into nextgenv2

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index 5b8632b..8eb30ed 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -392,12 +392,15 @@
     ARG_DEF(NULL, "frame-parallel", 1,
             "Enable frame parallel decodability features "
             "(0: false (default), 1: true)");
+#if CONFIG_DELTA_Q
 static const arg_def_t aq_mode = ARG_DEF(
     NULL, "aq-mode", 1,
     "Adaptive quantization mode (0: off (default), 1: variance 2: complexity, "
-#if CONFIG_DELTA_Q
     "3: cyclic refresh, 4: delta quant)");
 #else
+static const arg_def_t aq_mode = ARG_DEF(
+    NULL, "aq-mode", 1,
+    "Adaptive quantization mode (0: off (default), 1: variance 2: complexity, "
     "3: cyclic refresh)");
 #endif
 static const arg_def_t frame_periodic_boost =