diff --git a/src/ExtLib/ffmpeg/config.h b/src/ExtLib/ffmpeg/config.h
index 1975e56e56..7af071e6ca 100644
--- a/src/ExtLib/ffmpeg/config.h
+++ b/src/ExtLib/ffmpeg/config.h
@@ -1,15 +1,6 @@
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
-#define ARCH_X86 1
-#ifdef ARCH_X86_64
- #define ARCH_X86_32 0
- #define ARCH_X86_64 1
-#else
- #define ARCH_X86_32 1
- #define ARCH_X86_64 0
-#endif
-
#define SWS_MAX_FILTER_SIZE 256
#ifdef __GNUC__
#define HAVE_INLINE_ASM 1
@@ -71,7 +62,10 @@
#define HAVE_XOP_INLINE 1
#define HAVE_I686_INLINE 0
+ #define ARCH_X86 1
#ifdef ARCH_X86_64
+ #define ARCH_X86_32 0
+ #define ARCH_X86_64 1
#define BROKEN_RELOCATIONS 1
#define HAVE_FAST_64BIT 1
#define HAVE_FAST_CMOV 1
@@ -79,6 +73,8 @@
#define HAVE_XMM_CLOBBERS 1
#define CONFIG_PIC 1
#else
+ #define ARCH_X86_32 1
+ #define ARCH_X86_64 0
#define HAVE_FAST_64BIT 0
#define HAVE_FAST_CMOV 0
#define HAVE_MM_EMPTY 0
@@ -151,6 +147,14 @@
#define HAVE_XMM_CLOBBERS 0
#define CONFIG_PIC 0
+ #define ARCH_X86 1
+ #ifdef ARCH_X86_64
+ #define ARCH_X86_64 1
+ #else
+ #define ARCH_X86_64 0
+ #endif
+ #define ARCH_X86_32 0
+
#define av_restrict
#define __asm__ __asm
#endif
diff --git a/src/common.props b/src/common.props
index ec33ca518a..8ffecda24d 100644
--- a/src/common.props
+++ b/src/common.props
@@ -23,7 +23,7 @@
true
_WINDOWS;WINDOWS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;_WIN32_IE=0x0800;PSAPI_VERSION=1;_USE_MATH_DEFINES;__STDC_CONSTANT_MACROS;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)
NOMINMAX;%(PreprocessorDefinitions)
- WIN32;ARCH_X86_32;%(PreprocessorDefinitions)
+ WIN32;%(PreprocessorDefinitions)
_WIN64;WIN64;ARCH_X86_64;%(PreprocessorDefinitions)
Level3