[vlc-devel] [PATCH] contrib:ffmpeg: don't force x86 if not WIN64 on Windows

[Steve Lhomme]

From: Steve Lhomme <robUx4 at gmail.com>

it's possible to have WIN32 for ARM
---
 contrib/src/ffmpeg/rules.mak | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 24ce3c7..9e1ee21 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -110,6 +110,10 @@ FFMPEGCONF += --arch=x86
 endif
 endif
 
+ifeq ($(ARCH),x86)
+FFMPEGCONF+= --cpu=i686 --arch=x86
+endif
+
 # x86_64 stuff
 ifeq ($(ARCH),x86_64)
 ifndef HAVE_DARWIN_OS
@@ -159,8 +163,6 @@ FFMPEGCONF += --enable-w32threads --enable-dxva2
 
 ifdef HAVE_WIN64
 FFMPEGCONF += --cpu=athlon64 --arch=x86_64
-else # !WIN64
-FFMPEGCONF+= --cpu=i686 --arch=x86
 endif
 
 else # !Windows
-- 
2.6.0.windows.1