]> granicus.if.org Git - handbrake/commitdiff
x265: fix crash when encoding twice with different parameters
authorjstebbins <jstebbins.hb@gmail.com>
Sun, 1 Mar 2015 17:44:36 +0000 (17:44 +0000)
committerjstebbins <jstebbins.hb@gmail.com>
Sun, 1 Mar 2015 17:44:36 +0000 (17:44 +0000)
"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

contrib/x265/A01-cudata-init.patch [new file with mode: 0644]

diff --git a/contrib/x265/A01-cudata-init.patch b/contrib/x265/A01-cudata-init.patch
new file mode 100644 (file)
index 0000000..978059c
--- /dev/null
@@ -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)