diff options
| author | Bradley Sepos <[email protected]> | 2016-11-27 16:29:10 -0500 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2016-11-27 16:29:18 -0500 |
| commit | 41defa9c9c8a3e7dfad8424b2afb167aab629cb6 (patch) | |
| tree | be21815abb0130d046d46c38d827a57ea22a839f /contrib | |
| parent | 82490fe17e0b7f9cd452b1b18e6a5b5a73893d53 (diff) | |
contrib: Update to x264 r2708 86b7198.
Latest stable, albeit only three commits ahead of our last (minor). Adds X264_POINTVER to our defines patch.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x264/A00-version-string.patch | 15 | ||||
| -rw-r--r-- | contrib/x264/module.defs | 6 |
2 files changed, 14 insertions, 7 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch index e7b6f9189..8e46d601c 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 2b59b92..6211a64 100644 +index 2b59b92..86b7198 100644 --- a/x264.h +++ b/x264.h -@@ -45,7 +45,17 @@ extern "C" { +@@ -45,7 +45,24 @@ extern "C" { #include "x264_config.h" @@ -16,8 +16,15 @@ index 2b59b92..6211a64 100644 +#ifdef X264_VERSION +#undef X264_VERSION +#endif -+#define X264_BUILD 148 -+#define X264_VERSION " r2705 3f5ed56" ++#ifdef X264_BUILD ++#undef X264_BUILD ++#endif ++#ifdef X264_POINTVER ++#undef X264_POINTVER ++#endif ++#define X264_BUILD 148 ++#define X264_VERSION " r2708 86b7198" ++#define X264_POINTVER "0.148.2708 86b7198" /* 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 a9e0410bc..75af41c88 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,9 +1,9 @@ $(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-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.FETCH.url = http://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2 +X264.FETCH.url += https://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2 +X264.FETCH.md5 = af6a0a6e26a0b866718eb72ef3725992 X264.GCC.args.c_std = |