--- a/media/libaom/config/win/ia32/aom_config.asm
+++ b/media/libaom/config/win/ia32/aom_config.asm
@@ -25,18 +25,18 @@
 %define CONFIG_INSTALL_DOCS 1
 %define CONFIG_INSTALL_BINS 1
 %define CONFIG_INSTALL_LIBS 1
 %define CONFIG_INSTALL_SRCS 0
 %define CONFIG_DEBUG 0
 %define CONFIG_GPROF 0
 %define CONFIG_GCOV 0
 %define CONFIG_RVCT 0
-%define CONFIG_GCC 1
-%define CONFIG_MSVS 0
+%define CONFIG_GCC 0
+%define CONFIG_MSVS 1
 %define CONFIG_PIC 1
 %define CONFIG_BIG_ENDIAN 0
 %define CONFIG_CODEC_SRCS 0
 %define CONFIG_DEBUG_LIBS 0
 %define CONFIG_RUNTIME_CPU_DETECT 1
 %define CONFIG_POSTPROC 1
 %define CONFIG_MULTITHREAD 1
 %define CONFIG_INTERNAL_STATS 0

--- a/media/libaom/config/win/ia32/aom_config.c
+++ b/media/libaom/config/win/ia32/aom_config.c
@@ -2,10 +2,10 @@
 /*  */
 /* This source code is subject to the terms of the BSD 2 Clause License and */
 /* the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License */
 /* was not distributed with this source code in the LICENSE file, you can */
 /* obtain it at www.aomedia.org/license/software. If the Alliance for Open */
 /* Media Patent License 1.0 was not distributed with this source code in the */
 /* PATENTS file, you can obtain it at www.aomedia.org/license/patent. */
 #include "aom/aom_codec.h"
-static const char* const cfg = "--target=x86-win32-gcc --enable-external-build --disable-examples --disable-docs --disable-unit-tests --size-limit=8192x4608 --enable-pic --enable-postproc --as=yasm";
+static const char* const cfg = "--target=x86-win32-vs14 --enable-external-build --disable-examples --disable-docs --disable-unit-tests --size-limit=8192x4608 --enable-pic --enable-postproc --as=yasm";
 const char *aom_codec_build_config(void) {return cfg;}

--- a/media/libaom/config/win/ia32/aom_config.h
+++ b/media/libaom/config/win/ia32/aom_config.h
@@ -5,17 +5,17 @@
 /* was not distributed with this source code in the LICENSE file, you can */
 /* obtain it at www.aomedia.org/license/software. If the Alliance for Open */
 /* Media Patent License 1.0 was not distributed with this source code in the */
 /* PATENTS file, you can obtain it at www.aomedia.org/license/patent. */
 /* This file automatically generated by configure. Do not edit! */
 #ifndef AOM_CONFIG_H
 #define AOM_CONFIG_H
 #define RESTRICT    
-#define INLINE      inline
+#define INLINE      __forceinline
 #define ARCH_ARM 0
 #define ARCH_MIPS 0
 #define ARCH_X86 1
 #define ARCH_X86_64 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0
 #define HAVE_DSPR2 0
@@ -38,18 +38,18 @@
 #define CONFIG_INSTALL_DOCS 1
 #define CONFIG_INSTALL_BINS 1
 #define CONFIG_INSTALL_LIBS 1
 #define CONFIG_INSTALL_SRCS 0
 #define CONFIG_DEBUG 0
 #define CONFIG_GPROF 0
 #define CONFIG_GCOV 0
 #define CONFIG_RVCT 0
-#define CONFIG_GCC 1
-#define CONFIG_MSVS 0
+#define CONFIG_GCC 0
+#define CONFIG_MSVS 1
 #define CONFIG_PIC 1
 #define CONFIG_BIG_ENDIAN 0
 #define CONFIG_CODEC_SRCS 0
 #define CONFIG_DEBUG_LIBS 0
 #define CONFIG_RUNTIME_CPU_DETECT 1
 #define CONFIG_POSTPROC 1
 #define CONFIG_MULTITHREAD 1
 #define CONFIG_INTERNAL_STATS 0

--- a/media/libaom/config/win/x64/aom_config.c
+++ b/media/libaom/config/win/x64/aom_config.c
@@ -2,10 +2,10 @@
 /*  */
 /* This source code is subject to the terms of the BSD 2 Clause License and */
 /* the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License */
 /* was not distributed with this source code in the LICENSE file, you can */
 /* obtain it at www.aomedia.org/license/software. If the Alliance for Open */
 /* Media Patent License 1.0 was not distributed with this source code in the */
 /* PATENTS file, you can obtain it at www.aomedia.org/license/patent. */
 #include "aom/aom_codec.h"
-static const char* const cfg = "--target=x86_64-win64-vs12 --enable-external-build --disable-examples --disable-docs --disable-unit-tests --size-limit=8192x4608 --enable-pic --enable-postproc --as=yasm";
+static const char* const cfg = "--target=x86_64-win64-vs14 --enable-external-build --disable-examples --disable-docs --disable-unit-tests --size-limit=8192x4608 --enable-pic --enable-postproc --as=yasm";
 const char *aom_codec_build_config(void) {return cfg;}

--- a/media/libaom/generate_sources_mozbuild.sh
+++ b/media/libaom/generate_sources_mozbuild.sh
@@ -191,18 +191,18 @@ cd $TEMP_DIR
 echo "Generating config files."
 all_platforms="--enable-external-build --disable-examples --disable-docs --disable-unit-tests"
 all_platforms="${all_platforms} --size-limit=8192x4608 --enable-pic"
 x86_platforms="--enable-postproc --as=yasm"
 arm_platforms="--enable-runtime-cpu-detect --enable-realtime-only"
 gen_config_files linux/x64 "--target=x86_64-linux-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files linux/ia32 "--target=x86-linux-gcc ${all_platforms} ${x86_platforms}"
 gen_config_files mac/x64 "--target=x86_64-darwin9-gcc ${all_platforms} ${x86_platforms}"
-gen_config_files win/x64 "--target=x86_64-win64-vs12 ${all_platforms} ${x86_platforms}"
-gen_config_files win/ia32 "--target=x86-win32-gcc ${all_platforms} ${x86_platforms}"
+gen_config_files win/x64 "--target=x86_64-win64-vs14 ${all_platforms} ${x86_platforms}"
+gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
 
 gen_config_files linux/arm "--target=armv7-linux-gcc ${all_platforms} ${arm_platforms}"
 
 gen_config_files generic "--target=generic-gnu ${all_platforms}"
 
 echo "Remove temporary directory."
 cd $BASE_DIR
 rm -rf $TEMP_DIR