From: jstebbins <jstebbins.hb@gmail.com>
Date: Tue, 26 Aug 2014 22:12:34 +0000 (+0000)
Subject: x265: fix maxCUSize error
X-Git-Tag: 0.10.0~166
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8a162f6cba7e30e1f1150922cc99456069a867ac;p=handbrake

x265: fix maxCUSize error

x265 tries to protect you from doing multiple simultaneous encodes
using different settings.  It just happens to also prevent back to back
encodes from the same process with different settings which is just
pure idiocy.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@6365 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/contrib/x265/A00-maxCUSize-idiocy.patch b/contrib/x265/A00-maxCUSize-idiocy.patch
new file mode 100644
index 000000000..a93384604
--- /dev/null
+++ b/contrib/x265/A00-maxCUSize-idiocy.patch
@@ -0,0 +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)
+ 
++#if 0
+     static int once /* = 0 */;
+ 
+     if (ATOMIC_CAS32(&once, 0, 1) == 1)
+@@ -1064,6 +1065,7 @@
+         }
+     }
+     else
++#endif
+     {
+         // set max CU width & height
+         g_maxCUSize = param->maxCUSize;