From d79aa4a267606770b62388e0bcec4b3023ef4e07 Mon Sep 17 00:00:00 2001
From: v0lt <mpc-be@mail.ru>
Date: Mon, 8 Jul 2024 20:50:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=BA=D0=B0=20commit=20e81ca9b.=20=D0=9F=D0=BE=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=BE=D0=B9-=D1=82=D0=BE=20=D0=BD=D0=B5=D0=B2=D0=B5?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BC=D0=BE=D0=B9=20=D0=BF=D1=80=D0=B8=D1=87=D0=B8?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=20ARC?=
 =?UTF-8?q?H=5FX86=5F32=20=D0=B4=D0=BB=D1=8F=20x86=20=D0=BB=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=B0=D0=B5=D1=82=20=D0=BF=D1=80=D0=BE=D1=86=D0=B5=D1=81=D1=81?=
 =?UTF-8?q?=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B8.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ExtLib/ffmpeg/config.h | 22 +++++++++++++---------
 src/common.props           |  2 +-
 2 files changed, 14 insertions(+), 10 deletions(-)

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 @@
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PreprocessorDefinitions>_WINDOWS;WINDOWS;WINVER=0x0A00;_WIN32_WINNT=0x0A00;_WIN32_IE=0x0800;PSAPI_VERSION=1;_USE_MATH_DEFINES;__STDC_CONSTANT_MACROS;_HAS_STD_BYTE=0;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(NOMINMAX)'!='False'">NOMINMAX;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;ARCH_X86_32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(Platform)'=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Platform)'=='x64'">_WIN64;WIN64;ARCH_X86_64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <WarningLevel>Level3</WarningLevel>
     </ClCompile>