[x265-commits] [x265] asm: fix 32bit build following partition enum carnage

[Steve Borho]

details:   http://hg.videolan.org/x265/rev/27dfc522397e
branches:  
changeset: 4536:27dfc522397e
user:      Steve Borho <steve at borho.org>
date:      Fri Oct 18 00:42:27 2013 -0500
description:
asm: fix 32bit build following partition enum carnage
Subject: [x265] intra: remove unused variable

details:   http://hg.videolan.org/x265/rev/d6d7187c5f4e
branches:  
changeset: 4537:d6d7187c5f4e
user:      Steve Borho <steve at borho.org>
date:      Fri Oct 18 00:42:36 2013 -0500
description:
intra: remove unused variable

diffstat:

 source/common/vec/intra-sse3.cpp     |  1 -
 source/common/x86/asm-primitives.cpp |  6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diffs (27 lines):

diff -r 84857e7ba3e1 -r d6d7187c5f4e source/common/vec/intra-sse3.cpp
--- a/source/common/vec/intra-sse3.cpp	Thu Oct 17 22:15:00 2013 +0800
+++ b/source/common/vec/intra-sse3.cpp	Fri Oct 18 00:42:36 2013 -0500
@@ -2008,7 +2008,6 @@ void xPredIntraAng16x16(pixel* dst, int 
     }
     else if (intraPredAngle == 32)
     {
-        Vec8s tmp;
         __m128i itmp;
         refMain += 2;
 
diff -r 84857e7ba3e1 -r d6d7187c5f4e source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Thu Oct 17 22:15:00 2013 +0800
+++ b/source/common/x86/asm-primitives.cpp	Fri Oct 18 00:42:36 2013 -0500
@@ -61,9 +61,9 @@ extern "C" {
 #define HEVC_X64_SATD(cpu)
 #else
 #define HEVC_X64_SATD(cpu) \
-    p.satd[PARTITION_8x32] = cmp<8, 32, 8, 16, x265_pixel_satd_8x16_ ## cpu>; \
-    p.satd[PARTITION_16x32] = cmp<16, 32, 16, 16, x265_pixel_satd_16x16_ ## cpu>; \
-    p.satd[PARTITION_16x64] = cmp<16, 64, 16, 16, x265_pixel_satd_16x16_ ## cpu>;
+    p.satd[LUMA_8x32] = cmp<8, 32, 8, 16, x265_pixel_satd_8x16_ ## cpu>; \
+    p.satd[LUMA_16x32] = cmp<16, 32, 16, 16, x265_pixel_satd_16x16_ ## cpu>; \
+    p.satd[LUMA_16x64] = cmp<16, 64, 16, 16, x265_pixel_satd_16x16_ ## cpu>;
 #endif
 #define HEVC_SATD(cpu) \
     HEVC_X64_SATD(cpu) \