diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-26 21:34:58 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-26 21:34:58 +0100 |
| commit | adebdd278b8e21e7ffeb107af0b3e25534edc796 (patch) | |
| tree | 826f24088df473dcc5bbe62647f59817c40aa270 /plugins/ffap | |
| parent | 3ed2d21eddf76ebe1bf05d8624ff50598a1c8d28 (diff) | |
| parent | 7262368b6897b41188f0cf6844ca875027d425a4 (diff) | |
Merge branch 'master' into devel
Conflicts:
plugins/alsa/alsa.c
streamer.c
Diffstat (limited to 'plugins/ffap')
| -rw-r--r-- | plugins/ffap/ffap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/ffap/ffap.c b/plugins/ffap/ffap.c index 4319fd5f..23daa170 100644 --- a/plugins/ffap/ffap.c +++ b/plugins/ffap/ffap.c @@ -1252,7 +1252,7 @@ typedef int64_t x86_reg; # define REGSP esp typedef int32_t x86_reg; #else -#warning unknown arch +#warning unknown arch, SIMD optimizations will be disabled typedef int x86_reg; #endif @@ -1843,7 +1843,7 @@ static DB_decoder_t plugin = { .filetypes = filetypes }; -#ifdef HAVE_SSE2 +#if HAVE_SSE2 && !ARCH_UNKNOWN #define FF_MM_MMX 0x0001 ///< standard MMX #define FF_MM_3DNOW 0x0004 ///< AMD 3DNOW @@ -1949,7 +1949,7 @@ int mm_support(void) DB_plugin_t * ffap_load (DB_functions_t *api) { // detect sse2 -#ifdef HAVE_SSE2 +#if HAVE_SSE2 && !ARCH_UNKNOWN trace ("ffap: was compiled with sse2 support\n"); int mm_flags = mm_support (); if (mm_flags & FF_MM_SSE2) { |