From 71766ef7a451a48536255c62c273b037ebcb2c42 Mon Sep 17 00:00:00 2001
From: Jean-Marc Valin <jmvalin@jmvalin.ca>
Date: Mon, 17 Jun 2013 00:44:12 -0400
Subject: Avoids symbol clashes with Speex (pitch_xcorr) and libm (y1)

---
 celt/x86/pitch_sse.h | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'celt/x86')

diff --git a/celt/x86/pitch_sse.h b/celt/x86/pitch_sse.h
index 4512665c..d2413980 100644
--- a/celt/x86/pitch_sse.h
+++ b/celt/x86/pitch_sse.h
@@ -72,7 +72,7 @@ static inline void xcorr_kernel(const opus_val16 *x, const opus_val16 *y, opus_v
 }
 
 #define OVERRIDE_DUAL_INNER_PROD
-static inline opus_val32 dual_inner_prod(const opus_val16 *x, const opus_val16 *y1, const opus_val16 *y2, int N)
+static inline opus_val32 dual_inner_prod(const opus_val16 *x, const opus_val16 *y01, const opus_val16 *y02, int N)
 {
    int i;
    __m128 xsum1, xsum2;
@@ -82,8 +82,8 @@ static inline opus_val32 dual_inner_prod(const opus_val16 *x, const opus_val16 *
    for (i=0;i<N-3;i+=4)
    {
       __m128 xi = _mm_loadu_ps(x+i);
-      __m128 y1i = _mm_loadu_ps(y1+i);
-      __m128 y2i = _mm_loadu_ps(y2+i);
+      __m128 y1i = _mm_loadu_ps(y01+i);
+      __m128 y2i = _mm_loadu_ps(y02+i);
       xsum1 = _mm_add_ps(xsum1,_mm_mul_ps(xi, y1i));
       xsum2 = _mm_add_ps(xsum2,_mm_mul_ps(xi, y2i));
    }
@@ -94,8 +94,8 @@ static inline opus_val32 dual_inner_prod(const opus_val16 *x, const opus_val16 *
    _mm_store_ss(&xy, xsum1);
    for (;i<N;i++)
    {
-      xy = MAC16_16(xy, x[i], y1[i]);
-      xy = MAC16_16(xy, x[i], y2[i]);
+      xy = MAC16_16(xy, x[i], y01[i]);
+      xy = MAC16_16(xy, x[i], y02[i]);
    }
    return xy;
 }
-- 
cgit v1.2.3