summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-03-01 17:44:36 +0000
committerjstebbins <[email protected]>2015-03-01 17:44:36 +0000
commit4bb856e81f46538ce33b843889f5871127bf7c8d (patch)
treedb89f1556572b1a8406a9819e3540daadb94e7ce /contrib
parent264ee39dc2dbb3a966feb2849eaeb447c869086f (diff)
x265: fix crash when encoding twice with different parameters
"static" member in cudata was not re-initialized on second encode. git-svn-id: svn://svn.handbrake.fr/HandBrake/branches/0.10.x@6957 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib')
-rw-r--r--contrib/x265/A01-cudata-init.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/x265/A01-cudata-init.patch b/contrib/x265/A01-cudata-init.patch
new file mode 100644
index 000000000..978059cec
--- /dev/null
+++ b/contrib/x265/A01-cudata-init.patch
@@ -0,0 +1,12 @@
+diff -r 018e8bbaa854 source/common/cudata.cpp
+--- a/source/common/cudata.cpp Fri Feb 27 11:46:09 2015 +0530
++++ b/source/common/cudata.cpp Sun Mar 01 09:40:58 2015 -0800
+@@ -161,7 +161,7 @@
+ m_vChromaShift = CHROMA_V_SHIFT(csp);
+ m_numPartitions = NUM_4x4_PARTITIONS >> (depth * 2);
+
+- if (!s_partSet[0])
++ //if (!s_partSet[0])
+ {
+ s_numPartInCUSize = 1 << g_unitSizeDepth;
+ switch (g_maxLog2CUSize)