From 284516185f90412c22dfa9a28cb93fb344af591b Mon Sep 17 00:00:00 2001 From: Lennart Poettering 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.h | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'g711.h') diff --git a/g711.h b/g711.h index 9b2582d..ef43e3f 100644 --- a/g711.h +++ b/g711.h @@ -18,23 +18,23 @@ #include #ifdef FAST_ALAW_CONVERSION -extern uint8_t _st_13linear2alaw[0x2000]; -extern int16_t _st_alaw2linear16[256]; -#define st_13linear2alaw(sw) (_st_13linear2alaw[(sw + 0x1000)]) -#define st_alaw2linear16(uc) (_st_alaw2linear16[uc]) +extern uint8_t _sa_13linear2alaw[0x2000]; +extern int16_t _sa_alaw2linear16[256]; +#define sa_13linear2alaw(sw) (_sa_13linear2alaw[(sw + 0x1000)]) +#define sa_alaw2linear16(uc) (_sa_alaw2linear16[uc]) #else -unsigned char st_13linear2alaw(int16_t pcm_val); -int16_t st_alaw2linear16(unsigned char); +unsigned char sa_13linear2alaw(int16_t pcm_val); +int16_t sa_alaw2linear16(unsigned char); #endif #ifdef FAST_ULAW_CONVERSION -extern uint8_t _st_14linear2ulaw[0x4000]; -extern int16_t _st_ulaw2linear16[256]; -#define st_14linear2ulaw(sw) (_st_14linear2ulaw[(sw + 0x2000)]) -#define st_ulaw2linear16(uc) (_st_ulaw2linear16[uc]) +extern uint8_t _sa_14linear2ulaw[0x4000]; +extern int16_t _sa_ulaw2linear16[256]; +#define sa_14linear2ulaw(sw) (_sa_14linear2ulaw[(sw + 0x2000)]) +#define sa_ulaw2linear16(uc) (_sa_ulaw2linear16[uc]) #else -unsigned char st_14linear2ulaw(int16_t pcm_val); -int16_t st_ulaw2linear16(unsigned char); +unsigned char sa_14linear2ulaw(int16_t pcm_val); +int16_t sa_ulaw2linear16(unsigned char); #endif #endif -- cgit