summaryrefslogtreecommitdiffstats
path: root/contrib/x264/A00-version-string.patch
diff options
context:
space:
mode:
authorRodeo <[email protected]>2013-11-08 22:49:56 +0000
committerRodeo <[email protected]>2013-11-08 22:49:56 +0000
commit4521a52e7fa432426dd3886e14e9de0b99a17615 (patch)
tree053c5a290eaea69bafeffd48fbb14b843b5029e6 /contrib/x264/A00-version-string.patch
parent43f0bc9d538c86ea75a5cd627a81452e9d76b825 (diff)
Bump x264 to r2377 1ca7bb9.
Miscellaneous bugfixes and improvements. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5887 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x264/A00-version-string.patch')
-rw-r--r--contrib/x264/A00-version-string.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index 11b4d2c67..4580536a2 100644
--- 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 69dce07..044705c 100644
+index 699295b..31f040f 100644
--- a/x264.h
+++ b/x264.h
@@ -41,7 +41,17 @@
#include "x264_config.h"
--#define X264_BUILD 138
+-#define X264_BUILD 140
+/*
+ * Define the full version explicitly so that it survives a git --archive.
+ *
@@ -16,8 +16,8 @@ index 69dce07..044705c 100644
+#ifdef X264_VERSION
+#undef X264_VERSION
+#endif
-+#define X264_BUILD 138
-+#define X264_VERSION " r2358 9e941d1"
++#define X264_BUILD 140
++#define X264_VERSION " r2377 1ca7bb9"
/* Application developers planning to link against a shared library version of
* libx264 from a Microsoft Visual Studio or similar development environment