commit 59622cf29262bffc47efa09c4613f64e0a4691a9
author Arild Fuldseth (arilfuld) <arilfuld@cisco.com> Mon Oct 24 10:37:37 2016 +0200
committer Yaowu Xu <yaowu@google.com> Mon Oct 31 09:13:53 2016 -0700
tree 4522209cdefcedf9c990ef8440295efd42e66d64
parent 750955b4c13b64a9bf61aac31ddf3f8e21e49eac

Fixes compilation error on Windows/Visual Studio

Change-Id: I32377deb5f1e882370c70449cb8f68f2fdafcbef

aomenc.c

diff --git a/aomenc.c b/aomenc.c
index e32a922..ef174c2 100644
--- a/aomenc.c
+++ b/aomenc.c
@@ -1964,6 +1964,7 @@
           { stream->config.cfg.g_input_bit_depth = input.bit_depth; });
     }
 
+#if CONFIG_AOM_HIGHBITDEPTH
     FOREACH_STREAM({
       if (input.fmt != AOM_IMG_FMT_I420 && input.fmt != AOM_IMG_FMT_I42016) {
         /* Automatically upgrade if input is non-4:2:0 but a 4:2:0 profile
@@ -1980,7 +1981,6 @@
           default: break;
         }
       }
-#if CONFIG_AOM_HIGHBITDEPTH
       /* Automatically set the codec bit depth to match the input bit depth.
        * Upgrade the profile if required. */
       if (stream->config.cfg.g_input_bit_depth >
@@ -2003,7 +2003,6 @@
       if (stream->config.cfg.g_profile > 1) {
         stream->config.use_16bit_internal = 1;
       }
-#endif
       if (profile_updated) {
         fprintf(stderr,
                 "Warning: automatically upgrading to profile %d to "
@@ -2011,6 +2010,31 @@
                 stream->config.cfg.g_profile);
       }
     });
+#else
+    FOREACH_STREAM({
+      if (input.fmt != AOM_IMG_FMT_I420 && input.fmt != AOM_IMG_FMT_I42016) {
+        /* Automatically upgrade if input is non-4:2:0 but a 4:2:0 profile
+           was selected. */
+        switch (stream->config.cfg.g_profile) {
+          case 0:
+            stream->config.cfg.g_profile = 1;
+            profile_updated = 1;
+            break;
+          case 2:
+            stream->config.cfg.g_profile = 3;
+            profile_updated = 1;
+            break;
+          default: break;
+        }
+      }
+      if (profile_updated) {
+        fprintf(stderr,
+                "Warning: automatically upgrading to profile %d to "
+                "match input format.\n",
+                stream->config.cfg.g_profile);
+      }
+    });
+#endif
 
     FOREACH_STREAM(set_stream_dimensions(stream, input.width, input.height));
     FOREACH_STREAM(validate_stream_config(stream, &global));