diff options
author | Nick Kurshev <nickols_k@mail.ru> | 2003-01-20 16:33:47 +0000 |
---|---|---|
committer | Nick Kurshev <nickols_k@mail.ru> | 2003-01-20 16:33:47 +0000 |
commit | bfbc8de9d897ea6e0f176afac72a4ddd1a695949 (patch) | |
tree | eeb11f7f4511aa63fcb6e5f0bf0ef55fde3e3150 /libavcodec/liba52 | |
parent | 76fbb0248a0fc8a0c5d32fbb158372ee938eda63 (diff) | |
download | ffmpeg-streaming-bfbc8de9d897ea6e0f176afac72a4ddd1a695949.zip ffmpeg-streaming-bfbc8de9d897ea6e0f176afac72a4ddd1a695949.tar.gz |
Function renaming. Solves some namespace conflicts
Originally committed as revision 1478 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/liba52')
-rw-r--r-- | libavcodec/liba52/a52.h | 14 | ||||
-rw-r--r-- | libavcodec/liba52/parse.c | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/libavcodec/liba52/a52.h b/libavcodec/liba52/a52.h index ca3c9f1..ee80821 100644 --- a/libavcodec/liba52/a52.h +++ b/libavcodec/liba52/a52.h @@ -50,15 +50,15 @@ typedef struct a52_state_s a52_state_t; #define A52_LFE 16 #define A52_ADJUST_LEVEL 32 -a52_state_t * a52_init (uint32_t mm_accel); -sample_t * a52_samples (a52_state_t * state); -int a52_syncinfo (uint8_t * buf, int * flags, +extern a52_state_t * ff_a52_init (uint32_t mm_accel); +extern sample_t * ff_a52_samples (a52_state_t * state); +extern int ff_a52_syncinfo (uint8_t * buf, int * flags, int * sample_rate, int * bit_rate); -int a52_frame (a52_state_t * state, uint8_t * buf, int * flags, +extern int ff_a52_frame (a52_state_t * state, uint8_t * buf, int * flags, sample_t * level, sample_t bias); -void a52_dynrng (a52_state_t * state, +extern void ff_a52_dynrng (a52_state_t * state, sample_t (* call) (sample_t, void *), void * data); -int a52_block (a52_state_t * state); -void a52_free (a52_state_t * state); +extern int ff_a52_block (a52_state_t * state); +extern void ff_a52_free (a52_state_t * state); #endif /* A52_H */ diff --git a/libavcodec/liba52/parse.c b/libavcodec/liba52/parse.c index 59f2159..0a08bf4 100644 --- a/libavcodec/liba52/parse.c +++ b/libavcodec/liba52/parse.c @@ -45,7 +45,7 @@ typedef struct { static uint8_t halfrate[12] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 3}; -a52_state_t * a52_init (uint32_t mm_accel) +a52_state_t * ff_a52_init (uint32_t mm_accel) { a52_state_t * state; int i; @@ -70,12 +70,12 @@ a52_state_t * a52_init (uint32_t mm_accel) return state; } -sample_t * a52_samples (a52_state_t * state) +sample_t * ff_a52_samples (a52_state_t * state) { return state->samples; } -int a52_syncinfo (uint8_t * buf, int * flags, +int ff_a52_syncinfo (uint8_t * buf, int * flags, int * sample_rate, int * bit_rate) { static int rate[] = { 32, 40, 48, 56, 64, 80, 96, 112, @@ -120,7 +120,7 @@ int a52_syncinfo (uint8_t * buf, int * flags, } } -int a52_frame (a52_state_t * state, uint8_t * buf, int * flags, +int ff_a52_frame (a52_state_t * state, uint8_t * buf, int * flags, sample_t * level, sample_t bias) { static sample_t clev[4] = {LEVEL_3DB, LEVEL_45DB, LEVEL_6DB, LEVEL_45DB}; @@ -192,7 +192,7 @@ int a52_frame (a52_state_t * state, uint8_t * buf, int * flags, return 0; } -void a52_dynrng (a52_state_t * state, +void ff_a52_dynrng (a52_state_t * state, sample_t (* call) (sample_t, void *), void * data) { state->dynrnge = 0; @@ -512,7 +512,7 @@ static void coeff_get_coupling (a52_state_t * state, int nfchans, } } -int a52_block (a52_state_t * state) +int ff_a52_block (a52_state_t * state) { static const uint8_t nfchans_tbl[] = {2, 1, 2, 3, 3, 4, 4, 5, 1, 1, 2}; static int rematrix_band[4] = {25, 37, 61, 253}; @@ -887,7 +887,7 @@ int a52_block (a52_state_t * state) return 0; } -void a52_free (a52_state_t * state) +void ff_a52_free (a52_state_t * state) { free (state->samples); free (state); |