From 284516185f90412c22dfa9a28cb93fb344af591b Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 18 May 2007 00:10:02 +0000
Subject: really prefix everything with "sa_"

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@28 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce
---
 g711.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'g711.c')

diff --git a/g711.c b/g711.c
index 55a8239..df76ac7 100644
--- a/g711.c
+++ b/g711.c
@@ -91,7 +91,7 @@ static int16_t search(
  * For further information see John C. Bellamy's Digital Telephony, 1982,
  * John Wiley & Sons, pps 98-111 and 472-476.
  */
-unsigned char st_13linear2alaw(
+unsigned char sa_13linear2alaw(
 	int16_t		pcm_val)	/* 2's complement (13-bit range) */
 {
 	int16_t		mask;
@@ -132,7 +132,7 @@ unsigned char st_13linear2alaw(
  * alaw2linear() - Convert an A-law value to 16-bit signed linear PCM
  *
  */
-int16_t st_alaw2linear16(
+int16_t sa_alaw2linear16(
 	unsigned char	a_val)
 {
 	int16_t t;
@@ -193,7 +193,7 @@ int16_t st_alaw2linear16(
  * For further information see John C. Bellamy's Digital Telephony, 1982,
  * John Wiley & Sons, pps 98-111 and 472-476.
  */
-unsigned char st_14linear2ulaw(
+unsigned char sa_14linear2ulaw(
 	int16_t		pcm_val)	/* 2's complement (14-bit range) */
 {
 	int16_t		mask;
@@ -241,7 +241,7 @@ unsigned char st_14linear2ulaw(
  * Note that this function expects to be passed the complement of the
  * original code word. This is in keeping with ISDN conventions.
  */
-int16_t st_ulaw2linear16(
+int16_t sa_ulaw2linear16(
 	unsigned char	u_val)
 {
 	int16_t		t;
@@ -262,7 +262,7 @@ int16_t st_ulaw2linear16(
 
 #ifdef FAST_ALAW_CONVERSION
 
-int16_t _st_alaw2linear16[256] = {
+int16_t _sa_alaw2linear16[256] = {
      -5504,   -5248,   -6016,   -5760,   -4480,   -4224,   -4992,
      -4736,   -7552,   -7296,   -8064,   -7808,   -6528,   -6272,
      -7040,   -6784,   -2752,   -2624,   -3008,   -2880,   -2240,
@@ -302,7 +302,7 @@ int16_t _st_alaw2linear16[256] = {
        816,     784,     880,     848
 };
 
-uint8_t _st_13linear2alaw[0x2000] = {
+uint8_t _sa_13linear2alaw[0x2000] = {
    0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a,
    0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a,
    0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a, 0x2a,
@@ -992,7 +992,7 @@ uint8_t _st_13linear2alaw[0x2000] = {
 
 #ifdef FAST_ULAW_CONVERSION
 
-int16_t _st_ulaw2linear16[256] = {
+int16_t _sa_ulaw2linear16[256] = {
     -32124,  -31100,  -30076,  -29052,  -28028,  -27004,  -25980,
     -24956,  -23932,  -22908,  -21884,  -20860,  -19836,  -18812,
     -17788,  -16764,  -15996,  -15484,  -14972,  -14460,  -13948,
@@ -1032,7 +1032,7 @@ int16_t _st_ulaw2linear16[256] = {
         24,      16,       8,       0
 };
 
-uint8_t _st_14linear2ulaw[0x4000] = {
+uint8_t _sa_14linear2ulaw[0x4000] = {
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -2512,7 +2512,7 @@ unsigned char _a2u[128] = {			/* A- to u-law conversions */
 	120,	121,	122,	123,	124,	125,	126,	127};
 
 /* A-law to u-law conversion */
-unsigned char st_alaw2ulaw(
+unsigned char sa_alaw2ulaw(
 	unsigned char	aval)
 {
 	aval &= 0xff;
@@ -2521,7 +2521,7 @@ unsigned char st_alaw2ulaw(
 }
 
 /* u-law to A-law conversion */
-unsigned char st_ulaw2alaw(
+unsigned char sa_ulaw2alaw(
 	unsigned char	uval)
 {
 	uval &= 0xff;
-- 
cgit