commit fadc7cbc23307522c960493626b8ce826d6f16b9
author Sebastien Alaiwan <sebastien.alaiwan@allegrodvt.com> Thu Jun 08 22:10:43 2017 +0200
committer James Zern <jzern@google.com> Thu Jun 08 23:08:05 2017 +0000
tree c30f1a92040f0d6ee43f0aecf4f383e0d2333feb
parent cc54efdde843b588acc1081dd1c2cbf61359411d

Avoid #if inside macro arguments

Visual Studio doesn't support it.

Change-Id: Ie7bd21e6d9a8a30b7b89e9fca6b82dd2aa406a89

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index 3d82e15..053db22 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -638,10 +638,8 @@
   int arg_ctrls[ARG_CTRL_CNT_MAX][2];
   int arg_ctrl_cnt;
   int write_webm;
-#if CONFIG_HIGHBITDEPTH
   // whether to use 16bit internal buffers
   int use_16bit_internal;
-#endif
 };
 
 struct stream_state {
@@ -1802,11 +1800,8 @@
         }
       }
       if (stream->config.cfg.g_profile > 1) {
-#if CONFIG_HIGHBITDEPTH
+        if (!CONFIG_HIGHBITDEPTH) fatal("Unsupported profile.");
         stream->config.use_16bit_internal = 1;
-#else
-        fatal("Unsupported profile.");
-#endif
       }
       if (profile_updated && !global.quiet) {
         fprintf(stderr,