summaryrefslogtreecommitdiffstats
path: root/contrib/x265
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2014-08-26 22:12:34 +0000
committerjstebbins <[email protected]>2014-08-26 22:12:34 +0000
commit8a162f6cba7e30e1f1150922cc99456069a867ac (patch)
treec2d8663f79f260dbdffdb59038be84b5fe99c28e /contrib/x265
parentc269ccfe69c034349fe90916aa061c3edce0b0eb (diff)
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
Diffstat (limited to 'contrib/x265')
-rw-r--r--contrib/x265/A00-maxCUSize-idiocy.patch19
1 files changed, 19 insertions, 0 deletions
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;