[vlc-commits] Contribs: ffmpeg, do not assume i*86 if not WIN64 on Windows
Steve Lhomme
git at videolan.org
Fri Feb 5 20:10:54 CET 2016
vlc | branch: master | Steve Lhomme <robux at videolan.org> | Fri Feb 5 20:07:31 2016 +0100| [ef64f16e069248948aec326787399b461a0979ba] | committer: Jean-Baptiste Kempf
Contribs: ffmpeg, do not assume i*86 if not WIN64 on Windows
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ef64f16e069248948aec326787399b461a0979ba
---
contrib/src/ffmpeg/rules.mak | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index 3574e0a..ce7ca76 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -158,9 +158,11 @@ FFMPEGCONF += --enable-w32threads --enable-dxva2
ifdef HAVE_WIN64
FFMPEGCONF += --cpu=athlon64 --arch=x86_64
-else # !WIN64
+else
+ifeq ($(ARCH),i386) # 32bits intel
FFMPEGCONF+= --cpu=i686 --arch=x86
endif
+endif
else # !Windows
FFMPEGCONF += --enable-pthreads
More information about the vlc-commits
mailing list