X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fx264%2Fmodule.defs;h=5f51cf0c547cc2b005a4d9769f4ee51e5eb0989c;hb=4aa6f128d24766db4f785de9ac88722c317054bb;hp=cf9042dc26984c79c023add05ea161624a658e18;hpb=22af8c20d58ed407d3ac9fb42582958f02c3719c;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index cf9042dc..5f51cf0c 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url = http://download.m0k.org/handbrake/contrib/x264-r1163-3f56e27.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1510-33d382a.tar.gz
 X264.EXTRACT.tarbase = x264
 
 X264.CONFIGURE.deps   =
@@ -9,11 +9,12 @@ X264.CONFIGURE.shared =
 X264.CONFIGURE.static =
 
 X264.CONFIGURE.extra = --disable-mp4-output
+X264.CONFIGURE.extra += --disable-avs-input --disable-lavf-input --disable-ffms-input
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     X264.CONFIGURE.extra += --enable-pthread --cross-prefix=$(BUILD.spec)-
-    X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs ?extra)"
-    X264.CONFIGURE.env.LDFLAGS = LDFLAGS=-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib)
+    X264.CONFIGURE.env.CFLAGS = CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/)include) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver ?extra)"
+    X264.CONFIGURE.env.LDFLAGS = LDFLAGS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/)lib) $(call fn.ARGS,X264.GCC,*archs *sysroot *minver)"
 else
     X264.CONFIGURE.extra += --enable-pthread
 endif