diff options
Diffstat (limited to 'apps/codecs/libspeex/sb_celp.c')
-rw-r--r-- | apps/codecs/libspeex/sb_celp.c | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/apps/codecs/libspeex/sb_celp.c b/apps/codecs/libspeex/sb_celp.c index 6066c8c51b..c44cfffb58 100644 --- a/apps/codecs/libspeex/sb_celp.c +++ b/apps/codecs/libspeex/sb_celp.c | |||
@@ -35,7 +35,6 @@ | |||
35 | 35 | ||
36 | #include <math.h> | 36 | #include <math.h> |
37 | #include "sb_celp.h" | 37 | #include "sb_celp.h" |
38 | #include "stdlib.h" | ||
39 | #include "filters.h" | 38 | #include "filters.h" |
40 | #include "lpc.h" | 39 | #include "lpc.h" |
41 | #include "lsp.h" | 40 | #include "lsp.h" |
@@ -47,6 +46,10 @@ | |||
47 | #include "misc.h" | 46 | #include "misc.h" |
48 | #include "math_approx.h" | 47 | #include "math_approx.h" |
49 | 48 | ||
49 | #ifndef NULL | ||
50 | #define NULL 0 | ||
51 | #endif | ||
52 | |||
50 | /* Default size for the encoder and decoder stack (can be changed at compile time). | 53 | /* Default size for the encoder and decoder stack (can be changed at compile time). |
51 | This does not apply when using variable-size arrays or alloca. */ | 54 | This does not apply when using variable-size arrays or alloca. */ |
52 | #ifndef SB_ENC_STACK | 55 | #ifndef SB_ENC_STACK |
@@ -61,40 +64,40 @@ | |||
61 | #ifdef DISABLE_WIDEBAND | 64 | #ifdef DISABLE_WIDEBAND |
62 | void *sb_encoder_init(const SpeexMode *m) | 65 | void *sb_encoder_init(const SpeexMode *m) |
63 | { | 66 | { |
64 | speex_error("Wideband and Ultra-wideband are disabled"); | 67 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
65 | return NULL; | 68 | return NULL; |
66 | } | 69 | } |
67 | void sb_encoder_destroy(void *state) | 70 | void sb_encoder_destroy(void *state) |
68 | { | 71 | { |
69 | speex_error("Wideband and Ultra-wideband are disabled"); | 72 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
70 | } | 73 | } |
71 | int sb_encode(void *state, void *vin, SpeexBits *bits) | 74 | int sb_encode(void *state, void *vin, SpeexBits *bits) |
72 | { | 75 | { |
73 | speex_error("Wideband and Ultra-wideband are disabled"); | 76 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
74 | return -2; | 77 | return -2; |
75 | } | 78 | } |
76 | void *sb_decoder_init(const SpeexMode *m) | 79 | void *sb_decoder_init(const SpeexMode *m) |
77 | { | 80 | { |
78 | speex_error("Wideband and Ultra-wideband are disabled"); | 81 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
79 | return NULL; | 82 | return NULL; |
80 | } | 83 | } |
81 | void sb_decoder_destroy(void *state) | 84 | void sb_decoder_destroy(void *state) |
82 | { | 85 | { |
83 | speex_error("Wideband and Ultra-wideband are disabled"); | 86 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
84 | } | 87 | } |
85 | int sb_decode(void *state, SpeexBits *bits, void *vout) | 88 | int sb_decode(void *state, SpeexBits *bits, void *vout) |
86 | { | 89 | { |
87 | speex_error("Wideband and Ultra-wideband are disabled"); | 90 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
88 | return -2; | 91 | return -2; |
89 | } | 92 | } |
90 | int sb_encoder_ctl(void *state, int request, void *ptr) | 93 | int sb_encoder_ctl(void *state, int request, void *ptr) |
91 | { | 94 | { |
92 | speex_error("Wideband and Ultra-wideband are disabled"); | 95 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
93 | return -2; | 96 | return -2; |
94 | } | 97 | } |
95 | int sb_decoder_ctl(void *state, int request, void *ptr) | 98 | int sb_decoder_ctl(void *state, int request, void *ptr) |
96 | { | 99 | { |
97 | speex_error("Wideband and Ultra-wideband are disabled"); | 100 | speex_fatal("Wideband and Ultra-wideband are disabled"); |
98 | return -2; | 101 | return -2; |
99 | } | 102 | } |
100 | #else | 103 | #else |