[x265] [PATCH] intrapred: sync buffer overflow patch to mode --no-rdo

[Min Chen]

# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1374726165 -28800
# Node ID 91c1e008dbe929459f849de84ce5f710a39cb9c4
# Parent  d3ae586fca87ea5a2bc6ebd3e7356dc491182c64
intrapred: sync buffer overflow patch to mode --no-rdo

diff -r d3ae586fca87 -r 91c1e008dbe9 source/encoder/compress.cpp
--- a/source/encoder/compress.cpp	Wed Jul 24 19:41:20 2013 -0500
+++ b/source/encoder/compress.cpp	Thu Jul 25 12:22:45 2013 +0800
@@ -170,8 +170,15 @@
             x265::primitives.scale2D_64to32(buf_scale, fenc, stride);
             x265::primitives.transpose[3](buf_trans, buf_scale, 32);
 
+#if HIGH_BIT_DEPTH
+            Pel _above[4 * 32 + 1];
+            Pel _left[4 * 32 + 1];
+            Pel *const above = _above + 2 * 32;
+            Pel *const left = _left + 2 * 32;
+#else
             Pel above[2 * 32 + 1];
             Pel left[2 * 32 + 1];
+#endif
 
             above[0] = left[0] = pAbove0[0];
             x265::primitives.scale1D_128to64(above + 1, pAbove0 + 1, 0);
@@ -471,7 +478,7 @@
         {
             subTempPartCU = m_interCU_NxN[nextDepth_partIndex][nextDepth];
             subTempPartCU->initSubCU(outTempCU, nextDepth_partIndex, nextDepth, qp); // clear sub partition datas or init.
-            TComPic* subPic = subTempPartCU->getPic();

+            TComPic* subPic = subTempPartCU->getPic();
             m_origYuv[nextDepth]->copyFromPicYuv(subPic->getPicYuvOrg(), subTempPartCU->getAddr(), subTempPartCU->getZorderIdxInCU());
             
             Bool bInSlice = subTempPartCU->getSCUAddr() < slice->getSliceCurEndCUAddr();