X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=contrib%2Fx264%2Fmodule.defs;h=0f66393c9d456e3e747940dec2f1ff49a39c128d;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=a8c4690f31b138774028098f97bb0dc655f797af;hpb=572ec009f096ddc9a990e18b3afb14809470052f;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index a8c4690f..0f66393c 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,20 +1,18 @@
 $(eval $(call import.MODULE.defs,X264,x264,PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1563-fbcc1ec.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1713-c276662.tar.gz
 X264.EXTRACT.tarbase = x264
 
 X264.CONFIGURE.deps   =
 X264.CONFIGURE.shared =
 X264.CONFIGURE.static =
 
-X264.CONFIGURE.extra = --disable-mp4-output
-X264.CONFIGURE.extra += --disable-avs-input --disable-lavf-input --disable-ffms-input
+X264.CONFIGURE.extra = --disable-gpac
+X264.CONFIGURE.extra += --disable-avs --disable-lavf --disable-ffms --disable-swscale
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
-    X264.CONFIGURE.extra += --enable-pthread --cross-prefix=$(BUILD.spec)-
+    X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)-
     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