Bump x264 to r2389-956c8d8.

Miscellaneous fixes and improvements, as usual.

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

diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index 4580536a223b26597a7f761f0eb2170d6e5fa9a5..b1bced899680e73ec2e0dbbcfd5bba92b09f114e 100644 (file)
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -1,12 +1,12 @@
 diff --git a/x264.h b/x264.h
-index 699295b..31f040f 100644
+index 225a269..7ffcdda 100644
 --- a/x264.h
 +++ b/x264.h
 @@ -41,7 +41,17 @@
  
  #include "x264_config.h"
  
--#define X264_BUILD 140
+-#define X264_BUILD 142
 +/*
 + * Define the full version explicitly so that it survives a git --archive.
 + *
@@ -16,8 +16,8 @@ index 699295b..31f040f 100644
 +#ifdef  X264_VERSION
 +#undef  X264_VERSION
 +#endif
-+#define X264_BUILD       140
-+#define X264_VERSION " r2377 1ca7bb9"
++#define X264_BUILD       142
++#define X264_VERSION " r2389 956c8d8"
  
  /* 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 e4192b3a620e24c44197ca4d64668dffd0de558b..10c29d074d09f83358bbc5f5cf43ef66c9dfa845 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-r2377-1ca7bb9.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2389-956c8d8.tar.gz
 X264.EXTRACT.tarbase = x264
 
 X264.GCC.args.c_std =