diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/lib/codeclib.h | 3 | ||||
-rw-r--r-- | apps/codecs/libspeex/arch.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/apps/codecs/lib/codeclib.h b/apps/codecs/lib/codeclib.h index 52bf72f7dc..e7f45d3572 100644 --- a/apps/codecs/lib/codeclib.h +++ b/apps/codecs/lib/codeclib.h | |||
@@ -58,9 +58,6 @@ int strcmp(const char *, const char *); | |||
58 | 58 | ||
59 | void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); | 59 | void qsort(void *base, size_t nmemb, size_t size, int(*compar)(const void *, const void *)); |
60 | 60 | ||
61 | #define abs(x) ((x)>0?(x):-(x)) | ||
62 | #define labs(x) abs(x) | ||
63 | |||
64 | /*MDCT library functions*/ | 61 | /*MDCT library functions*/ |
65 | 62 | ||
66 | extern void mdct_backward(int n, int32_t *in, int32_t *out); | 63 | extern void mdct_backward(int n, int32_t *in, int32_t *out); |
diff --git a/apps/codecs/libspeex/arch.h b/apps/codecs/libspeex/arch.h index 9f81e0c51e..35b5363837 100644 --- a/apps/codecs/libspeex/arch.h +++ b/apps/codecs/libspeex/arch.h | |||
@@ -80,6 +80,7 @@ | |||
80 | #include "speex/speex_types.h" | 80 | #include "speex/speex_types.h" |
81 | #endif | 81 | #endif |
82 | 82 | ||
83 | #undef ABS | ||
83 | #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ | 84 | #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ |
84 | #define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ | 85 | #define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ |
85 | #define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ | 86 | #define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ |