OSDN Git Service

x264 bump from 1627 to 1643
authorjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Wed, 9 Jun 2010 18:00:42 +0000 (18:00 +0000)
committerjstebbins <jstebbins@b64f7644-9d1e-0410-96f1-a4d463321fa5>
Wed, 9 Jun 2010 18:00:42 +0000 (18:00 +0000)
More various bug fixes and enhancements.
Fixes an mmx issue that caused aac and lame audio encoding breakage.

git-svn-id: svn://localhost/HandBrake/trunk@3375 b64f7644-9d1e-0410-96f1-a4d463321fa5

contrib/x264/module.defs

index 5864237..1d581cf 100644 (file)
@@ -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