diff options
| author | Jonathan Lennox <jonathan@vidyo.com> | 2015-11-20 11:51:45 -0500 |
|---|---|---|
| committer | Jean-Marc Valin <jmvalin@jmvalin.ca> | 2015-11-22 22:25:02 -0500 |
| commit | 5fa1952e990994eccfdd9b139fe71d2800ef28da (patch) | |
| tree | 89fcf85bdad724ac43551fa786bdfcc9de768a7b | |
| parent | 5fa2dcee5cf644f9c32d3d6525e170eb0222a3ae (diff) | |
| download | opus-5fa1952e990994eccfdd9b139fe71d2800ef28da.tar.gz | |
Fix x86 build if we presume SSE4.1 (and earlier), but not AVX.
Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca>
| -rw-r--r-- | celt/cpu_support.h | 3 | ||||
| -rw-r--r-- | celt/x86/x86cpu.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/celt/cpu_support.h b/celt/cpu_support.h index 133abbfc..68fc6067 100644 --- a/celt/cpu_support.h +++ b/celt/cpu_support.h @@ -45,7 +45,8 @@ #elif (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \ (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \ - (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) + (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \ + (defined(OPUS_X86_MAY_HAVE_AVX) && !defined(OPUS_X86_PRESUME_AVX)) #include "x86/x86cpu.h" /* We currently support 5 x86 variants: diff --git a/celt/x86/x86cpu.c b/celt/x86/x86cpu.c index 1a73dd1f..555a576b 100644 --- a/celt/x86/x86cpu.c +++ b/celt/x86/x86cpu.c @@ -37,7 +37,8 @@ #if (defined(OPUS_X86_MAY_HAVE_SSE) && !defined(OPUS_X86_PRESUME_SSE)) || \ (defined(OPUS_X86_MAY_HAVE_SSE2) && !defined(OPUS_X86_PRESUME_SSE2)) || \ - (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) + (defined(OPUS_X86_MAY_HAVE_SSE4_1) && !defined(OPUS_X86_PRESUME_SSE4_1)) || \ + (defined(OPUS_X86_MAY_HAVE_AVX) && !defined(OPUS_X86_PRESUME_AVX)) #if defined(_MSC_VER) |