[vlc-devel] commit: Contrib: fix FFmpeg for Win64 compilation (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Wed Sep  2 17:32:43 2009 +0200| [be671af178cdb9f07f7550240a066e15e394b878] | committer: Jean-Baptiste Kempf 

Contrib: fix FFmpeg for Win64 compilation

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=be671af178cdb9f07f7550240a066e15e394b878
---

 extras/contrib/src/Makefile |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a827ce8..18f5506 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -59,7 +59,6 @@ endif
 
 ifneq ($(CC),)
 HOSTCC+= CC="$(CC)"
-FFMPEGCONF += --cc=$(CC)
 endif
 ifneq ($(CXX),)
 HOSTCC+= CXX="$(CXX)"
@@ -117,9 +116,11 @@ endif
 ifdef HAVE_WIN32
 HOSTCONF+= --without-pic --disable-shared --enable-msw --disable-dependency-tracking
 FFMPEGCONF+= --target-os=mingw32 --enable-memalign-hack --cpu=i686 --arch=i686
-endif
 ifdef HAVE_WIN64
-FFMPEGCONF+= --cpu=x86_64
+FFMPEGCONF+= --cpu=i686 --arch=x86_64
+else
+FFMPEGCONF+= --cpu=i686 --arch=x86_32
+endif
 endif
 
 ifdef HAVE_WINCE