summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorBradley Sepos <[email protected]>2016-08-10 07:46:35 -0400
committerBradley Sepos <[email protected]>2016-08-10 17:01:51 -0400
commit63291bf58b5adc3e33200b4f05b4a589c009ad4d (patch)
tree7832fddfb60ab4db746af047cfc786800e2a03de /contrib
parentdcd2f92dda1e5ddd6f7d34da522f1670cf19f35e (diff)
contrib: Update to x264 148 r2705.
Bug fixes, performance improvements when using faster presets.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/x264/A00-version-string.patch6
-rw-r--r--contrib/x264/module.defs7
2 files changed, 6 insertions, 7 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index 925c83d45..e7b6f9189 100644
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -1,8 +1,8 @@
diff --git a/x264.h b/x264.h
-index 2e4a98d..2065222 100644
+index 2b59b92..6211a64 100644
--- a/x264.h
+++ b/x264.h
-@@ -41,7 +41,17 @@
+@@ -45,7 +45,17 @@ extern "C" {
#include "x264_config.h"
@@ -17,7 +17,7 @@ index 2e4a98d..2065222 100644
+#undef X264_VERSION
+#endif
+#define X264_BUILD 148
-+#define X264_VERSION " r2665 a01e339"
++#define X264_VERSION " r2705 3f5ed56"
/* 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 495d92846..a9e0410bc 100644
--- a/contrib/x264/module.defs
+++ b/contrib/x264/module.defs
@@ -1,10 +1,9 @@
$(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32))
$(eval $(call import.CONTRIB.defs,X264))
-# TODO: Unknown upstream url
-X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2665-a01e339.tar.gz
-X264.FETCH.md5 = 4ffeac9157c5a7119b5b6ff36a5d96b7
-X264.EXTRACT.tarbase = x264
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160809-2245-stable.tar.bz2
+X264.FETCH.url += https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160809-2245-stable.tar.bz2
+X264.FETCH.md5 = 7ca36de9a2c57c1711ecb517e60d815d
X264.GCC.args.c_std =