diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-21 02:57:29 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-21 02:57:29 +0000 |
commit | 0f1c8b8df4a4bd8596282a341a5564195ecd340a (patch) | |
tree | 39859596c62f878a9f2957c3a40d36e48c475044 /codecs | |
parent | bc32cd5adfe0da2d1d1a08c6bc5b04b9e7d0160e (diff) |
FreeBSD patch, take 2
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1638 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
-rwxr-xr-x | codecs/Makefile | 4 | ||||
-rwxr-xr-x | codecs/lpc10/lpcini.c | 28 | ||||
-rwxr-xr-x | codecs/mp3/include/L3.h | 7 |
3 files changed, 30 insertions, 9 deletions
diff --git a/codecs/Makefile b/codecs/Makefile index ac812972c..c6bfbe97d 100755 --- a/codecs/Makefile +++ b/codecs/Makefile @@ -22,6 +22,7 @@ MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so") MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") CFLAGS+=-fPIC +CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") LIBG723=g723.1/libg723.a LIBG723B=g723.1b/libg723b.a @@ -30,7 +31,8 @@ LIBGSM=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; else echo " LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi) LIBMP3=mp3/libmp3.a LIBLPC10=lpc10/liblpc10.a -LIBSPEEX=-lspeex -lm +LIBSPEEX=$(shell [ -f /usr/local/lib/libspeex.a ] && echo "-L/usr/local/lib") +LIBSPEEX+=-lspeex -lm LIBILBC=ilbc/libilbc.a CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so \ diff --git a/codecs/lpc10/lpcini.c b/codecs/lpc10/lpcini.c index 75e9ff2af..78cfafdd8 100755 --- a/codecs/lpc10/lpcini.c +++ b/codecs/lpc10/lpcini.c @@ -1,7 +1,10 @@ /* $Log$ -Revision 1.16 2003/10/16 21:11:29 martinp +Revision 1.17 2003/10/21 02:57:29 markster +FreeBSD patch, take 2 + +Revision 1.16 2003/10/18 00:26:43 tholo Revert the previous patch since it's braking compilation Revision 1.3 2003/10/16 21:11:30 martinp @@ -37,7 +40,7 @@ extern int lpcini_(void); #include "f2c.h" -#include <malloc.h> +#include <stdlib.h> /* Common Block Declarations */ @@ -51,9 +54,12 @@ struct { /* ***************************************************************** */ /* $Log$ - * Revision 1.16 2003/10/16 21:11:29 martinp - * Revert the previous patch since it's braking compilation + * Revision 1.17 2003/10/21 02:57:29 markster + * FreeBSD patch, take 2 * +/* Revision 1.16 2003/10/18 00:26:43 tholo +/* Revert the previous patch since it's braking compilation +/* /* Revision 1.3 2003/10/16 21:11:30 martinp /* Revert the previous patch since it's braking compilation /* @@ -83,9 +89,12 @@ struct { { /* $Log$ - * Revision 1.16 2003/10/16 21:11:29 martinp - * Revert the previous patch since it's braking compilation + * Revision 1.17 2003/10/21 02:57:29 markster + * FreeBSD patch, take 2 * +/* Revision 1.16 2003/10/18 00:26:43 tholo +/* Revert the previous patch since it's braking compilation +/* /* Revision 1.3 2003/10/16 21:11:30 martinp /* Revert the previous patch since it's braking compilation /* @@ -115,9 +124,12 @@ struct { /* LPC Configuration parameters: */ /* Frame size, Prediction order, Pitch period */ /* $Log$ - * Revision 1.16 2003/10/16 21:11:29 martinp - * Revert the previous patch since it's braking compilation + * Revision 1.17 2003/10/21 02:57:29 markster + * FreeBSD patch, take 2 * +/* Revision 1.16 2003/10/18 00:26:43 tholo +/* Revert the previous patch since it's braking compilation +/* /* Revision 1.3 2003/10/16 21:11:30 martinp /* Revert the previous patch since it's braking compilation /* diff --git a/codecs/mp3/include/L3.h b/codecs/mp3/include/L3.h index e920afd94..337a721fb 100755 --- a/codecs/mp3/include/L3.h +++ b/codecs/mp3/include/L3.h @@ -37,6 +37,13 @@ ____________________________________________________________________________*/ /* #define GLOBAL_GAIN_SCALE 0 */ +#ifdef __FreeBSD__ +#ifdef __i386__ +#undef LITTLE_ENDIAN +#define LITTLE_ENDIAN 1 +#endif +#endif + #ifdef _M_IX86 #define LITTLE_ENDIAN 1 #endif |