diff options
Diffstat (limited to 'codecs')
| -rw-r--r-- | codecs/speex/arch.h | 2 | ||||
| -rw-r--r-- | codecs/speex/resample.c | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/codecs/speex/arch.h b/codecs/speex/arch.h index e160663ee1..eaad6b9260 100644 --- a/codecs/speex/arch.h +++ b/codecs/speex/arch.h @@ -70,7 +70,9 @@ #include "speex/speexdsp_types.h" #endif +#ifndef ABS /* already defined by glib.h */ #define ABS(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute integer value. */ +#endif #define ABS16(x) ((x) < 0 ? (-(x)) : (x)) /**< Absolute 16-bit value. */ #define MIN16(a,b) ((a) < (b) ? (a) : (b)) /**< Maximum 16-bit value. */ #define MAX16(a,b) ((a) > (b) ? (a) : (b)) /**< Maximum 16-bit value. */ diff --git a/codecs/speex/resample.c b/codecs/speex/resample.c index 1faf88b0bd..0a903792f0 100644 --- a/codecs/speex/resample.c +++ b/codecs/speex/resample.c @@ -63,10 +63,10 @@ #define FLOATING_POINT 1 #ifdef OUTSIDE_SPEEX -#include <stdlib.h> -static void *speex_alloc (size_t size) {return calloc(size,1);} -static void *speex_realloc (void *ptr, size_t size) {return realloc(ptr, size);} -static void speex_free (void *ptr) {free(ptr);} +#include <glib.h> +static void *speex_alloc (size_t size) {return g_malloc0(size);} +static void *speex_realloc (void *ptr, size_t size) {return g_realloc(ptr, size);} +static void speex_free (void *ptr) {g_free(ptr);} #include "speex_resampler.h" #include "arch.h" #else /* OUTSIDE_SPEEX */ |