diff options
| author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-16 10:44:04 +0000 |
|---|---|---|
| committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2003-10-16 10:44:04 +0000 |
| commit | 8b42787b24549191ee7af71210b0d3ac9183a80c (patch) | |
| tree | 249a4bc16955c96385aacc1433bef36557c1d1f3 /codecs | |
| parent | 99b4cfd0e443f57b12cb461391659b251572e900 (diff) | |
Sane FreeBSD patch
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@1635 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'codecs')
| -rwxr-xr-x | codecs/Makefile | 4 | ||||
| -rwxr-xr-x | codecs/lpc10/lpcini.c | 30 | ||||
| -rwxr-xr-x | codecs/mp3/include/L3.h | 7 |
3 files changed, 31 insertions, 10 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 90d61b987..e39f07750 100755 --- a/codecs/lpc10/lpcini.c +++ b/codecs/lpc10/lpcini.c @@ -1,8 +1,11 @@ /* $Log$ -Revision 1.14 2003/02/12 13:59:15 matteo -mer feb 12 14:56:57 CET 2003 +Revision 1.15 2003/10/16 10:44:04 markster +Sane FreeBSD patch + +Revision 1.2 2003/10/16 10:44:04 markster +Sane FreeBSD patch Revision 1.1.1.1 2003/02/12 13:59:15 matteo mer feb 12 14:56:57 CET 2003 @@ -34,7 +37,7 @@ extern int lpcini_(void); #include "f2c.h" -#include <malloc.h> +#include <stdlib.h> /* Common Block Declarations */ @@ -48,9 +51,12 @@ struct { /* ***************************************************************** */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:15 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/10/16 10:44:04 markster + * Sane FreeBSD patch * +/* Revision 1.2 2003/10/16 10:44:04 markster +/* Sane FreeBSD patch +/* /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -77,9 +83,12 @@ struct { { /* $Log$ - * Revision 1.14 2003/02/12 13:59:15 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/10/16 10:44:04 markster + * Sane FreeBSD patch * +/* Revision 1.2 2003/10/16 10:44:04 markster +/* Sane FreeBSD patch +/* /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* mer feb 12 14:56:57 CET 2003 /* @@ -106,9 +115,12 @@ struct { /* LPC Configuration parameters: */ /* Frame size, Prediction order, Pitch period */ /* $Log$ - * Revision 1.14 2003/02/12 13:59:15 matteo - * mer feb 12 14:56:57 CET 2003 + * Revision 1.15 2003/10/16 10:44:04 markster + * Sane FreeBSD patch * +/* Revision 1.2 2003/10/16 10:44:04 markster +/* Sane FreeBSD patch +/* /* Revision 1.1.1.1 2003/02/12 13:59:15 matteo /* mer feb 12 14:56:57 CET 2003 /* 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 |