diff options
author | Nils Wallménius <nils@rockbox.org> | 2013-12-11 22:59:14 +0100 |
---|---|---|
committer | Nils Wallménius <nils@rockbox.org> | 2013-12-16 21:13:23 +0100 |
commit | e3c2ed7a71f65dc721c7210f120259ecd4ff65cb (patch) | |
tree | de593c1e927dcc036f1b6656f1f881995491b3b9 /lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h | |
parent | d0918b98fa0cfba21208a4fb5ed153687b8f02c3 (diff) | |
download | rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.tar.gz rockbox-e3c2ed7a71f65dc721c7210f120259ecd4ff65cb.zip |
Sync libopus to upstream release 1.1
Change-Id: I9fea7460fc33f60faff961b3389dd97b5191463c
Diffstat (limited to 'lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h b/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h index 866a6520ca..cc52f37c36 100644 --- a/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h +++ b/lib/rbcodec/codecs/libopus/celt/_kiss_fft_guts.h | |||
@@ -94,15 +94,15 @@ | |||
94 | do {(res).r = ADD32((res).r,(a).r); (res).i = SUB32((res).i,(a).i); \ | 94 | do {(res).r = ADD32((res).r,(a).r); (res).i = SUB32((res).i,(a).i); \ |
95 | }while(0) | 95 | }while(0) |
96 | 96 | ||
97 | #if defined(ARMv4_ASM) | 97 | #if defined(OPUS_ARM_INLINE_ASM) |
98 | #include "arm/kiss_fft_armv4.h" | 98 | #include "arm/kiss_fft_armv4.h" |
99 | #endif | 99 | #endif |
100 | 100 | ||
101 | #if defined(ARMv5E_ASM) | 101 | #if defined(OPUS_ARM_INLINE_EDSP) |
102 | #include "arm/kiss_fft_armv5e.h" | 102 | #include "arm/kiss_fft_armv5e.h" |
103 | #endif | 103 | #endif |
104 | 104 | ||
105 | #if defined(CF_ASM) | 105 | #if defined(OPUS_CF_INLINE_ASM) |
106 | #include "cf/kiss_fft_cf.h" | 106 | #include "cf/kiss_fft_cf.h" |
107 | #endif | 107 | #endif |
108 | 108 | ||