summaryrefslogtreecommitdiffstats
path: root/contrib/x265/A00-maxCUSize-idiocy.patch
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-11-04 21:03:34 +0000
committerjstebbins <[email protected]>2014-11-04 21:03:34 +0000
commit0dd06e8795f6e9cd773f3021cb079f9274c54c03 (patch)
treed23511bcf323c5ba4a737f525309e802cb0800c4 /contrib/x265/A00-maxCUSize-idiocy.patch
parentb4d10ea92a0811968e09ec385e97a0be1f63336b (diff)
contrib: bump x265 to version 1.4
Speed improvements in the slower presets (if you have lots of cores). git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6504 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/x265/A00-maxCUSize-idiocy.patch')
-rw-r--r--contrib/x265/A00-maxCUSize-idiocy.patch18
1 files changed, 9 insertions, 9 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];
+