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/silk/typedef.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/silk/typedef.h')
-rw-r--r-- | lib/rbcodec/codecs/libopus/silk/typedef.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/rbcodec/codecs/libopus/silk/typedef.h b/lib/rbcodec/codecs/libopus/silk/typedef.h index 073aa28cc7..97b7e709be 100644 --- a/lib/rbcodec/codecs/libopus/silk/typedef.h +++ b/lib/rbcodec/codecs/libopus/silk/typedef.h | |||
@@ -8,7 +8,7 @@ this list of conditions and the following disclaimer. | |||
8 | - Redistributions in binary form must reproduce the above copyright | 8 | - Redistributions in binary form must reproduce the above copyright |
9 | notice, this list of conditions and the following disclaimer in the | 9 | notice, this list of conditions and the following disclaimer in the |
10 | documentation and/or other materials provided with the distribution. | 10 | documentation and/or other materials provided with the distribution. |
11 | - Neither the name of Internet Society, IETF or IETF Trust, nor the | 11 | - Neither the name of Internet Society, IETF or IETF Trust, nor the |
12 | names of specific contributors, may be used to endorse or promote | 12 | names of specific contributors, may be used to endorse or promote |
13 | products derived from this software without specific prior written | 13 | products derived from this software without specific prior written |
14 | permission. | 14 | permission. |
@@ -29,6 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
29 | #define SILK_TYPEDEF_H | 29 | #define SILK_TYPEDEF_H |
30 | 30 | ||
31 | #include "opus_types.h" | 31 | #include "opus_types.h" |
32 | #include "opus_defines.h" | ||
32 | 33 | ||
33 | #ifndef FIXED_POINT | 34 | #ifndef FIXED_POINT |
34 | # include <float.h> | 35 | # include <float.h> |
@@ -63,7 +64,7 @@ POSSIBILITY OF SUCH DAMAGE. | |||
63 | #ifdef __GNUC__ | 64 | #ifdef __GNUC__ |
64 | __attribute__((noreturn)) | 65 | __attribute__((noreturn)) |
65 | #endif | 66 | #endif |
66 | static inline void _silk_fatal(const char *str, const char *file, int line) | 67 | static OPUS_INLINE void _silk_fatal(const char *str, const char *file, int line) |
67 | { | 68 | { |
68 | fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); | 69 | fprintf (stderr, "Fatal (internal) error in %s, line %d: %s\n", file, line, str); |
69 | abort(); | 70 | abort(); |