Upgrade x264 to r2334-a3ac64b

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5585 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index dcd4ec62806b217bff8c2518d61ccb2e99b98e5f..49a65225608a068b2d80cfb1ea2999498db24960 100644 (file)
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -6,7 +6,7 @@ index e5a1600..f635d9e 100644
  
  #include "x264_config.h"
  
--#define X264_BUILD 130
+-#define X264_BUILD 133
 +/*
 + * Define the full version explicitly so that it survives a git --archive.
 + *
@@ -16,8 +16,8 @@ index e5a1600..f635d9e 100644
 +#ifdef  X264_VERSION
 +#undef  X264_VERSION
 +#endif
-+#define X264_BUILD       130
-+#define X264_VERSION " r2273 b3065e6"
++#define X264_BUILD       133
++#define X264_VERSION " r2334 a3ac64b"
  
  /* Application developers planning to link against a shared library version of
   * libx264 from a Microsoft Visual Studio or similar development environment

diff --git a/contrib/x264/module.defs b/contrib/x264/module.defs
index 097f88d42324aa88b92ab3b08cc1df17b30f4022..458a6cddf686320cf2b33f674a7a18510e681b2d 100644 (file)
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,7 +1,7 @@
 $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
 $(eval $(call import.CONTRIB.defs,X264))
 
-X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2273-b3065e6.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2334-a3ac64b.tar.gz
 X264.EXTRACT.tarbase = x264
 
 X264.CONFIGURE.deps   =
@@ -9,7 +9,7 @@ X264.CONFIGURE.shared =
 X264.CONFIGURE.static =
 
 X264.CONFIGURE.extra = --disable-cli --enable-static --enable-strip
-X264.CONFIGURE.extra += --disable-gpac --disable-avs --disable-lavf --disable-ffms --disable-swscale
+X264.CONFIGURE.extra += --disable-gpac --disable-avs --disable-lavf --disable-ffms --disable-swscale --disable-opencl
 
 ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
     X264.CONFIGURE.extra += --cross-prefix=$(BUILD.spec)-