summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2010-06-09 18:00:42 +0000
committerjstebbins <[email protected]>2010-06-09 18:00:42 +0000
commit20c52cb94e7cb9db92a58a8aca3f92715d073f98 (patch)
tree3f9a366e0e47f2fcd530531d89fba0dac5777f03
parent6892a1d090340bceb7ef1dc475c402b2ba2da644 (diff)
x264 bump from 1627 to 1643
More various bug fixes and enhancements. Fixes an mmx issue that caused aac and lame audio encoding breakage. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3375 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--contrib/x264/module.defs10
1 files changed, 4 insertions, 6 deletions
diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 58642371e..1d581cf8c 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-r1627-d0d8751.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r1643-59a9e03.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
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