[vlc-commits] commit: contribs: update x264 options ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Fri Oct  8 22:34:28 2010 +0200| [6f3f8160c7fc5c254d34155c366394aa21955310] | committer: Rafaël Carré 

contribs: update x264 options

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

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 153bba5..bfea663 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -185,7 +185,7 @@ ifdef HAVE_ISA_THUMB
 NOTHUMB ?= -mno-thumb
 endif
 
-X264CONF+= --disable-avs-input --disable-lavf-input --disable-ffms-input --disable-mp4-output
+X264CONF+= --disable-avs --disable-lavf --disable-ffms --disable-mp4-output
 
 DATE=`date +%Y-%m-%d`
 
@@ -1409,7 +1409,7 @@ ifdef HAVE_WIN32
   ifdef HAVE_CYGWIN
 	(cd $<; $(HOSTCC) RANLIB="ranlib" AR="ar" STRIP="strip" ./configure $(X264CONF) --prefix="$(PREFIX)" --extra-cflags="-I$(PREFIX)/include" --extra-ldflags="-L$(PREFIX)/lib" && make && make install)
   else
-	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" --enable-pthread && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(X264CONF) --prefix="$(PREFIX)" && make && make install)
   endif
 else
 ifdef HAVE_DARWIN_OS_ON_INTEL