diff options
| author | Thom Johansen <thomj@rockbox.org> | 2007-10-19 21:10:25 +0000 |
|---|---|---|
| committer | Thom Johansen <thomj@rockbox.org> | 2007-10-19 21:10:25 +0000 |
| commit | 56db5597548d0e9b9733b556a5c14ab4e38547e6 (patch) | |
| tree | 8846e7d3a15f264853e6ee238994e3522e3bcc5a /apps/codecs/libspeex/pseudofloat.h | |
| parent | 6dc3a743addde6146b736ec5e1c71159c2150f95 (diff) | |
| download | rockbox-56db5597548d0e9b9733b556a5c14ab4e38547e6.zip rockbox-56db5597548d0e9b9733b556a5c14ab4e38547e6.tar.gz rockbox-56db5597548d0e9b9733b556a5c14ab4e38547e6.tar.bz2 rockbox-56db5597548d0e9b9733b556a5c14ab4e38547e6.tar.xz | |
Sync Speex to SVN. Add new header file to adapt to Speex' new way of doing wrapper functions.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15209 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/codecs/libspeex/pseudofloat.h')
| -rw-r--r-- | apps/codecs/libspeex/pseudofloat.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/apps/codecs/libspeex/pseudofloat.h b/apps/codecs/libspeex/pseudofloat.h index 05542f1..9d58864 100644 --- a/apps/codecs/libspeex/pseudofloat.h +++ b/apps/codecs/libspeex/pseudofloat.h @@ -59,6 +59,10 @@ static const spx_float_t FLOAT_ZERO = {0,0}; static const spx_float_t FLOAT_ONE = {16384,-14}; static const spx_float_t FLOAT_HALF = {16384,-15}; +#ifdef MIN +#undef MIN +#endif +#define MIN(a,b) ((a)<(b)?(a):(b)) static inline spx_float_t PSEUDOFLOAT(spx_int32_t x) { int e=0; |