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/float_cast.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/float_cast.h')
| -rw-r--r-- | lib/rbcodec/codecs/libopus/celt/float_cast.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/libopus/celt/float_cast.h b/lib/rbcodec/codecs/libopus/celt/float_cast.h index 5ded291599..ede6574860 100644 --- a/lib/rbcodec/codecs/libopus/celt/float_cast.h +++ b/lib/rbcodec/codecs/libopus/celt/float_cast.h | |||
| @@ -101,7 +101,7 @@ | |||
| 101 | #include <math.h> | 101 | #include <math.h> |
| 102 | 102 | ||
| 103 | /* Win32 doesn't seem to have these functions. | 103 | /* Win32 doesn't seem to have these functions. |
| 104 | ** Therefore implement inline versions of these functions here. | 104 | ** Therefore implement OPUS_INLINE versions of these functions here. |
| 105 | */ | 105 | */ |
| 106 | 106 | ||
| 107 | __inline long int | 107 | __inline long int |
| @@ -128,7 +128,7 @@ | |||
| 128 | #endif | 128 | #endif |
| 129 | 129 | ||
| 130 | #ifndef DISABLE_FLOAT_API | 130 | #ifndef DISABLE_FLOAT_API |
| 131 | static inline opus_int16 FLOAT2INT16(float x) | 131 | static OPUS_INLINE opus_int16 FLOAT2INT16(float x) |
| 132 | { | 132 | { |
| 133 | x = x*CELT_SIG_SCALE; | 133 | x = x*CELT_SIG_SCALE; |
| 134 | x = MAX32(x, -32768); | 134 | x = MAX32(x, -32768); |