[x265] [PATCH 2 of 3] asm: fix Main12 fault on AVX2 dequant

[Min Chen]

# HG changeset patch
# User Min Chen <chenm003 at 163.com>
# Date 1438027386 25200
# Node ID 9fbbf8c772a46830c21287addb82039963e68a5d
# Parent  a2ffc27aed1aed64e9c64b325b9d6d1b77ad182a
asm: fix Main12 fault on AVX2 dequant
---
 source/common/x86/asm-primitives.cpp |    2 --
 source/common/x86/pixel-util8.asm    |    4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff -r a2ffc27aed1a -r 9fbbf8c772a4 source/common/x86/asm-primitives.cpp
--- a/source/common/x86/asm-primitives.cpp	Mon Jul 27 13:03:03 2015 -0700
+++ b/source/common/x86/asm-primitives.cpp	Mon Jul 27 13:03:06 2015 -0700
@@ -1541,10 +1541,8 @@
 
         p.quant = PFX(quant_avx2);
         p.nquant = PFX(nquant_avx2);
-#if X265_DEPTH <= 10
         p.dequant_normal  = PFX(dequant_normal_avx2);
         p.dequant_scaling = PFX(dequant_scaling_avx2);
-#endif
         p.dst4x4 = PFX(dst4_avx2);
         p.idst4x4 = PFX(idst4_avx2);
         p.denoiseDct = PFX(denoise_dct_avx2);
diff -r a2ffc27aed1a -r 9fbbf8c772a4 source/common/x86/pixel-util8.asm
--- a/source/common/x86/pixel-util8.asm	Mon Jul 27 13:03:03 2015 -0700
+++ b/source/common/x86/pixel-util8.asm	Mon Jul 27 13:03:06 2015 -0700
@@ -1048,8 +1048,8 @@
 %if HIGH_BIT_DEPTH
     cmp             r3d, 32767
     jle            .skip
-    shr             r3d, 2
-    sub             r4d, 2
+    shr             r3d, (BIT_DEPTH - 8)
+    sub             r4d, (BIT_DEPTH - 8)
 .skip:
 %endif
     movd            xm0, r4d            ; m0 = shift