[vlc-devel] commit: [Contribs] Small FFMPEGCONF cleanup. (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Oct 16 01:57:03 2008 +0200| [f83418ee9e536fcb60f3e7652cec7f3db3a7315b] | committer: Jean-Baptiste Kempf 

[Contribs] Small FFMPEGCONF cleanup.

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

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a85350e..89aff9d 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -84,14 +84,9 @@ else
 HOSTCC2=$(HOSTCC)
 endif
 
-# For ffmpeg if not cross compiling
-ifneq ($(CC),)
-  FFMPEGCONF=--cc="$(CC)"
-endif
+FFMPEGCONF=
 
-#
 # cross compiling
-#
 #This should be inside the if block but some config scripts are buggy
 HOSTCONF=--target=$(HOST) --host=$(HOST) --build=$(BUILD) --program-prefix=""
 ifneq ($(BUILD),$(HOST))
@@ -101,7 +96,7 @@ ifneq ($(BUILD),$(HOST))
     #
     ifndef HAVE_CYGWIN
         # We are REALLY cross compiling
-        FFMPEGCONF=--cross-prefix=$(HOST)- --enable-cross-compile
+        FFMPEGCONF+=--cross-prefix=$(HOST)- --enable-cross-compile
         X264CONF=--host=$(HOST)
         PTHREADSCONF="CROSS=$(HOST)-"
     else