summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2015-03-01 17:27:40 +0000
committerjstebbins <[email protected]>2015-03-01 17:27:40 +0000
commit6106f068ddc39e4d8aca10f42dc955cfae183360 (patch)
tree1075eb825a74eeb37f60294fe3411d8639e92001
parentd5417252adb2c3413150762ac3f4f826d24d395d (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/trunk@6956 b64f7644-9d1e-0410-96f1-a4d463321fa5
-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..0623dca10
--- /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:24:49 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)