diff options
| -rw-r--r-- | contrib/x265/A00-maxCUSize-idiocy.patch | 18 | ||||
| -rw-r--r-- | contrib/x265/module.defs | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/contrib/x265/A00-maxCUSize-idiocy.patch b/contrib/x265/A00-maxCUSize-idiocy.patch index a93384604..862a1e6f6 100644 --- a/contrib/x265/A00-maxCUSize-idiocy.patch +++ b/contrib/x265/A00-maxCUSize-idiocy.patch @@ -1,19 +1,19 @@ -diff -r c1e4fc0162c1 source/common/param.cpp ---- a/source/common/param.cpp Thu Aug 21 16:49:02 2014 -0500 -+++ b/source/common/param.cpp Tue Aug 26 14:52:01 2014 -0700 -@@ -1053,6 +1053,7 @@ - uint32_t maxCUDepth = maxLog2CUSize - 2; - uint32_t tuQTMinLog2Size = 2; //log2(4) +diff -r d2db9c1ab44b source/common/param.cpp +--- a/source/common/param.cpp Fri Oct 31 13:52:08 2014 -0500 ++++ b/source/common/param.cpp Mon Nov 03 10:28:18 2014 -0800 +@@ -1059,6 +1059,7 @@ + int x265_set_globals(x265_param *param) + { +#if 0 static int once /* = 0 */; if (ATOMIC_CAS32(&once, 0, 1) == 1) -@@ -1064,6 +1065,7 @@ +@@ -1070,6 +1071,7 @@ } } else +#endif { - // set max CU width & height - g_maxCUSize = param->maxCUSize; + uint32_t maxLog2CUSize = (uint32_t)g_log2Size[param->maxCUSize]; + diff --git a/contrib/x265/module.defs b/contrib/x265/module.defs index a74130214..e2e27b0fa 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-7847-c1e4fc0162c1-1.3.tar.bz2 +X265.FETCH.url = http://download.handbrake.fr/contrib/x265-8768-5e604833c5aa-1.4.tar.bz2 X265.CONFIGURE.exe = cmake X265.CONFIGURE.args.prefix = -DCMAKE_INSTALL_PREFIX="$(X265.CONFIGURE.prefix)" |