[x265] [PATCH] intrapred: fix bug on --cpuid less than 4

[Min Chen]

# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1374817206 -28800
# Node ID 4b574a020b57f762bb2e8ce101cdb835a982d932
# Parent  1dfbbb7d2476aba631c0290583789b3076c6b30c
intrapred: fix bug on --cpuid less than 4

diff -r 1dfbbb7d2476 -r 4b574a020b57 source/Lib/TLibEncoder/TEncSearch.cpp
--- a/source/Lib/TLibEncoder/TEncSearch.cpp	Thu Jul 25 14:34:22 2013 -0500
+++ b/source/Lib/TLibEncoder/TEncSearch.cpp	Fri Jul 26 13:40:06 2013 +0800
@@ -2018,15 +2018,10 @@
                 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);
diff -r 1dfbbb7d2476 -r 4b574a020b57 source/encoder/compress.cpp
--- a/source/encoder/compress.cpp	Thu Jul 25 14:34:22 2013 -0500
+++ b/source/encoder/compress.cpp	Fri Jul 26 13:40:06 2013 +0800
@@ -170,15 +170,10 @@
             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);