diff options
author | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-29 04:49:24 +0000 |
---|---|---|
committer | markster <markster@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-03-29 04:49:24 +0000 |
commit | de060dd25bf45b1ca8cb18b26bd9c59d144686c7 (patch) | |
tree | 4c7e9cead02cc96ac8467cf7fcce545de722fe75 /formats | |
parent | f2529d4563eea317dcbb7bdbefcfd198da83936f (diff) |
Simplify endianness and fix for unaligned reads (bug #3867)
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@5295 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'formats')
-rwxr-xr-x | formats/format_g726.c | 10 | ||||
-rwxr-xr-x | formats/format_g729.c | 10 | ||||
-rwxr-xr-x | formats/format_gsm.c | 10 | ||||
-rwxr-xr-x | formats/format_h263.c | 10 | ||||
-rwxr-xr-x | formats/format_ilbc.c | 10 | ||||
-rwxr-xr-x | formats/format_jpeg.c | 10 | ||||
-rwxr-xr-x | formats/format_pcm.c | 10 | ||||
-rwxr-xr-x | formats/format_pcm_alaw.c | 10 | ||||
-rwxr-xr-x | formats/format_sln.c | 10 | ||||
-rwxr-xr-x | formats/format_vox.c | 10 | ||||
-rwxr-xr-x | formats/format_wav.c | 10 | ||||
-rwxr-xr-x | formats/format_wav_gsm.c | 10 |
12 files changed, 12 insertions, 108 deletions
diff --git a/formats/format_g726.c b/formats/format_g726.c index d549823c8..0371a7558 100755 --- a/formats/format_g726.c +++ b/formats/format_g726.c @@ -16,6 +16,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -24,15 +25,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #define RATE_40 0 #define RATE_32 1 diff --git a/formats/format_g729.c b/formats/format_g729.c index 5e79c00e1..46fd0953f 100755 --- a/formats/format_g729.c +++ b/formats/format_g729.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif /* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */ diff --git a/formats/format_gsm.c b/formats/format_gsm.c index 8c3f2d517..c4a63aa68 100755 --- a/formats/format_gsm.c +++ b/formats/format_gsm.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #include "msgsm.h" /* Some Ideas for this code came from makegsme.c by Jeffrey Chilton */ diff --git a/formats/format_h263.c b/formats/format_h263.c index 17805b231..a676cf8fb 100755 --- a/formats/format_h263.c +++ b/formats/format_h263.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif /* Some Ideas for this code came from makeh263e.c by Jeffrey Chilton */ diff --git a/formats/format_ilbc.c b/formats/format_ilbc.c index 571e74d67..c34099461 100755 --- a/formats/format_ilbc.c +++ b/formats/format_ilbc.c @@ -19,6 +19,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -27,15 +28,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif /* Some Ideas for this code came from makeg729e.c by Jeffrey Chilton */ diff --git a/formats/format_jpeg.c b/formats/format_jpeg.c index b08403009..d750e567e 100755 --- a/formats/format_jpeg.c +++ b/formats/format_jpeg.c @@ -19,6 +19,7 @@ #include <asterisk/module.h> #include <asterisk/image.h> #include <asterisk/lock.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -27,15 +28,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif static char *desc = "JPEG (Joint Picture Experts Group) Image Format"; diff --git a/formats/format_pcm.c b/formats/format_pcm.c index 14edd0bb6..79f5f226a 100755 --- a/formats/format_pcm.c +++ b/formats/format_pcm.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #define BUF_SIZE 160 /* 160 samples */ diff --git a/formats/format_pcm_alaw.c b/formats/format_pcm_alaw.c index b677bb6fe..b5f27be39 100755 --- a/formats/format_pcm_alaw.c +++ b/formats/format_pcm_alaw.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -27,15 +28,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #define BUF_SIZE 160 /* 160 samples */ diff --git a/formats/format_sln.c b/formats/format_sln.c index d1826a366..4c0b1bc52 100755 --- a/formats/format_sln.c +++ b/formats/format_sln.c @@ -15,6 +15,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -23,15 +24,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #define BUF_SIZE 320 /* 320 samples */ diff --git a/formats/format_vox.c b/formats/format_vox.c index 7601994fd..3413a4aa2 100755 --- a/formats/format_vox.c +++ b/formats/format_vox.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #define BUF_SIZE 80 /* 160 samples */ diff --git a/formats/format_wav.c b/formats/format_wav.c index c0781f6f0..66b82d468 100755 --- a/formats/format_wav.c +++ b/formats/format_wav.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */ diff --git a/formats/format_wav_gsm.c b/formats/format_wav_gsm.c index b1a0c1c1e..fcd4c2ac2 100755 --- a/formats/format_wav_gsm.c +++ b/formats/format_wav_gsm.c @@ -17,6 +17,7 @@ #include <asterisk/logger.h> #include <asterisk/sched.h> #include <asterisk/module.h> +#include <asterisk/endian.h> #include <netinet/in.h> #include <arpa/inet.h> #include <stdlib.h> @@ -25,15 +26,6 @@ #include <unistd.h> #include <errno.h> #include <string.h> -#ifdef __linux__ -#include <endian.h> -#else -#ifdef SOLARIS -#include "solaris-compat/compat.h" -#else -#include <machine/endian.h> -#endif -#endif #include "msgsm.h" /* Some Ideas for this code came from makewave.c by Jeffrey Chilton */ |