From: Johann <johannkoenig@google.com>
Date: Tue, 29 Mar 2011 14:28:30 +0000 (-0400)
Subject: use GLOBAL correctly on 32bit shared libraries
X-Git-Tag: v0.9.7~250
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f0c22a3f333ad9a3e1218b8387879766bfea6d42;p=libvpx

use GLOBAL correctly on 32bit shared libraries

http://code.google.com/p/webm/issues/detail?id=309

Change-Id: I6fce9e2f74bc09a9f258df7f91ab599812324e8c
---

diff --git a/vp8/encoder/x86/quantize_sse2.asm b/vp8/encoder/x86/quantize_sse2.asm
index bc70b68a9..9a1584024 100644
--- a/vp8/encoder/x86/quantize_sse2.asm
+++ b/vp8/encoder/x86/quantize_sse2.asm
@@ -130,7 +130,7 @@ sym(vp8_regular_quantize_b_sse2):
     mov         [rsp + zrun_zbin_boost], rsi
 
 %macro ZIGZAG_LOOP 1
-    movsx       edx, WORD PTR[GLOBAL(zig_zag) + (%1 * 2)] ; rc
+    movsx       edx, WORD PTR[GLOBAL(zig_zag + (%1 * 2))] ; rc
 
     ; x
     movsx       ecx, WORD PTR[rsp + abs_minus_zbin + rdx *2]
@@ -209,7 +209,7 @@ ZIGZAG_LOOP 15
     pxor        xmm3, xmm6
     ; mask inv_zig_zag
     pand        xmm2, [GLOBAL(inv_zig_zag)]
-    pand        xmm3, [GLOBAL(inv_zig_zag) + 16]
+    pand        xmm3, [GLOBAL(inv_zig_zag + 16)]
     ; select the max value
     pmaxsw      xmm2, xmm3
     pshufd      xmm3, xmm2, 00001110b