diff --git a/media/libaom/config/win/ia32/aom_config.h b/media/libaom/config/win/ia32/aom_config.h index a48752371018..326956a1c17a 100644 --- a/media/libaom/config/win/ia32/aom_config.h +++ b/media/libaom/config/win/ia32/aom_config.h @@ -10,7 +10,7 @@ #ifndef AOM_CONFIG_H #define AOM_CONFIG_H #define RESTRICT -#define INLINE __forceinline +#define INLINE __inline #define ARCH_ARM 0 #define ARCH_MIPS 0 #define ARCH_X86 1 diff --git a/media/libaom/config/win/x64/aom_config.h b/media/libaom/config/win/x64/aom_config.h index 50fc467bb5e3..3f6f772c4513 100644 --- a/media/libaom/config/win/x64/aom_config.h +++ b/media/libaom/config/win/x64/aom_config.h @@ -10,7 +10,7 @@ #ifndef AOM_CONFIG_H #define AOM_CONFIG_H #define RESTRICT -#define INLINE __forceinline +#define INLINE __inline #define ARCH_ARM 0 #define ARCH_MIPS 0 #define ARCH_X86 0 diff --git a/third_party/aom/configure b/third_party/aom/configure index 50a5fb2662bc..08fb03451fe8 100755 --- a/third_party/aom/configure +++ b/third_party/aom/configure @@ -892,7 +892,7 @@ process_toolchain() { gen_vcproj_cmd=${source_path}/build/make/gen_msvs_vcxproj.sh enabled werror && gen_vcproj_cmd="${gen_vcproj_cmd} --enable-werror" all_targets="${all_targets} solution" - INLINE="__forceinline" + INLINE="__inline" ;; esac