diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/x265/A00-maxCUSize-idiocy.patch | 19 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 2 |
2 files changed, 1 insertions, 20 deletions
diff --git a/contrib/x265/A00-maxCUSize-idiocy.patch b/contrib/x265/A00-maxCUSize-idiocy.patch deleted file mode 100644 index a5f718101..000000000 --- a/contrib/x265/A00-maxCUSize-idiocy.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -r 32d72a0285e0 source/common/param.cpp ---- a/source/common/param.cpp Tue Feb 10 21:38:22 2015 -0600 -+++ b/source/common/param.cpp Thu Feb 12 09:12:01 2015 -0700 -@@ -1151,6 +1151,7 @@ - - int x265_set_globals(x265_param *param) - { -+#if 0 - static int once /* = 0 */; - - if (ATOMIC_INC(&once) > 1) -@@ -1162,6 +1163,7 @@ - } - } - else -+#endif - { - uint32_t maxLog2CUSize = (uint32_t)g_log2Size[param->maxCUSize]; - diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index 071f7a600..d17b44830 100644 --- a/contrib/x265/module.defs +++ b/contrib/x265/module.defs @@ -2,7 +2,7 @@ __deps__ := YASM CMAKE $(eval $(call import.MODULE.defs,X265,x265,$(__deps__))) $(eval $(call import.CONTRIB.defs,X265)) -X265.FETCH.url = http://download.handbrake.fr/contrib/x265-9329-0d30d2641875-1.5.tar.bz2 +X265.FETCH.url = http://download.handbrake.fr/contrib/x265-9964-cbeb7d8a4880-1.6.tar.bz2 X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" |