diff options
| author | John Stebbins <[email protected]> | 2017-12-26 12:38:21 -0800 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2018-01-10 01:39:48 -0500 |
| commit | bd19e65b00d49aed5cbda35610ee54db4d57d1c3 (patch) | |
| tree | 146c89ccd4c3fd0d5657c7cfea45d51fd29db818 /contrib/x264 | |
| parent | 4cef41652f48517ea7183b213e39e8c259fed41e (diff) | |
x264: bump to build 155
Requires NASM to build
Unified 8 and 10 bit library support
AVX-512 optimizations
Various other bug fixes and improvements
Diffstat (limited to 'contrib/x264')
| -rw-r--r-- | contrib/x264/A00-version-string.patch | 8 | ||||
| -rw-r--r-- | contrib/x264/module.defs | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/contrib/x264/A00-version-string.patch b/contrib/x264/A00-version-string.patch index 8e46d601c..2f7c9f96c 100644 --- a/contrib/x264/A00-version-string.patch +++ b/contrib/x264/A00-version-string.patch @@ -6,7 +6,7 @@ index 2b59b92..86b7198 100644 #include "x264_config.h" --#define X264_BUILD 148 +-#define X264_BUILD 155 +/* + * Define the full version explicitly so that it survives a git --archive. + * @@ -22,9 +22,9 @@ index 2b59b92..86b7198 100644 +#ifdef X264_POINTVER +#undef X264_POINTVER +#endif -+#define X264_BUILD 148 -+#define X264_VERSION " r2708 86b7198" -+#define X264_POINTVER "0.148.2708 86b7198" ++#define X264_BUILD 155 ++#define X264_VERSION " r2893 b00bcaf" ++#define X264_POINTVER "0.155.2893 b00bcaf" /* 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 17b1e58ec..ee71e70f1 100644 --- a/contrib/x264/module.defs +++ b/contrib/x264/module.defs @@ -1,16 +1,15 @@ $(eval $(call import.MODULE.defs,X264,x264,YASM PTHREADW32)) $(eval $(call import.CONTRIB.defs,X264)) -X264.FETCH.url = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20160920-2245-stable.tar.bz2 -X264.FETCH.url += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20160920-2245-stable.tar.bz2 -X264.FETCH.sha256 = 6ba2d848eabbca0d9d2c2a12b263e02f856a81fce87fbc74df52a1097c88e39c +X264.FETCH.url = https://download.handbrake.fr/handbrake/contrib/x264-snapshot-20171225-2245.tar.bz2 +X264.FETCH.url += https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-20171225-2245.tar.bz2 +X264.FETCH.sha256 = ea39f32ccb3bd3aeaccd663c8d210117be5d9cfbe89e1a8b5f631e0f7ed74954 X264.GCC.args.c_std = X264.CONFIGURE.deps = X264.CONFIGURE.shared = -X264.CONFIGURE.extra = --bit-depth=8 --chroma-format=420 X264.CONFIGURE.extra += --disable-lavf --disable-ffms --disable-avs --disable-swscale --disable-gpac --disable-lsmash --disable-cli ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) |