summaryrefslogtreecommitdiffstats
path: root/contrib/x264
diff options
context:
space:
mode:
authorRodeo <[email protected]>2014-03-27 13:18:42 +0000
committerRodeo <[email protected]>2014-03-27 13:18:42 +0000
commitf3a1a8ea3e300fe0d34501fa3cfa7e3edbac8ea2 (patch)
treeb675c7231c6ffb8d307bd10cdc99b1cfd165377c /contrib/x264
parent9dcb8cf25bf31c6c36a455493bd187b6f0d209bc (diff)
Bump x264 to r2409-d6b4e63.
Miscellaneous fixes and improvements as usual, plus a small performance improvement: https://git.videolan.org/?p=x264.git;a=commit;h=d6b4e63 git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6133 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x264')
-rw-r--r--contrib/x264/A00-version-string.patch4
-rw-r--r--contrib/x264/module.defs2
2 files changed, 3 insertions, 3 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index b1bced899..6af0744d8 100644
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -1,5 +1,5 @@
diff --git a/x264.h b/x264.h
-index 225a269..7ffcdda 100644
+index 2e4a98d..6261638 100644
--- a/x264.h
+++ b/x264.h
@@ -41,7 +41,17 @@
@@ -17,7 +17,7 @@ index 225a269..7ffcdda 100644
+#undef X264_VERSION
+#endif
+#define X264_BUILD 142
-+#define X264_VERSION " r2389 956c8d8"
++#define X264_VERSION " r2409 d6b4e63"
/* 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 9633233bc..e6a83e78e 100644
--- 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-r2389-956c8d8.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2409-d6b4e63.tar.gz
X264.EXTRACT.tarbase = x264
X264.GCC.args.c_std =