summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorsr55 <sr55.hb@outlook.com>2016-04-02 20:51:43 +0100
committersr55 <sr55.hb@outlook.com>2016-04-02 20:51:43 +0100
commit70d6abf14aeba4b2215e7616c6b1d2965f99861a (patch)
tree23a97fe2e59464fc505b9562161973cdefa55f85 /contrib
parent6c56b2bed72bbb5f4d4d5b14307385ef42225b83 (diff)
Upgrade x264 to r2665 a01e339
Diffstat (limited to 'contrib')
-rw-r--r--contrib/x264/A00-version-string.patch6
-rw-r--r--contrib/x264/module.defs2
2 files changed, 4 insertions, 4 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch
index 4f0396f90..925c83d45 100644
--- a/contrib/x264/A00-version-string.patch
+++ b/contrib/x264/A00-version-string.patch
@@ -6,7 +6,7 @@ index 2e4a98d..2065222 100644
#include "x264_config.h"
--#define X264_BUILD 144
+-#define X264_BUILD 148
+/*
+ * Define the full version explicitly so that it survives a git --archive.
+ *
@@ -16,8 +16,8 @@ index 2e4a98d..2065222 100644
+#ifdef X264_VERSION
+#undef X264_VERSION
+#endif
-+#define X264_BUILD 144
-+#define X264_VERSION " r2525 40bb568"
++#define X264_BUILD 148
++#define X264_VERSION " r2665 a01e339"
/* 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 fa9bb2570..ff4936a81 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-r2525-40bb568.tar.gz
+X264.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-r2665-a01e339.tar.gz
X264.EXTRACT.tarbase = x264
X264.GCC.args.c_std =