aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Kurshev <nickols_k@mail.ru>2003-01-20 18:43:31 +0000
committerNick Kurshev <nickols_k@mail.ru>2003-01-20 18:43:31 +0000
commit56f7fda16b4fb12416a158fec8fdcb9cbf4b530e (patch)
treef733fb266b5b66ce502c0880e2e746b970c9d046
parentbfbc8de9d897ea6e0f176afac72a4ddd1a695949 (diff)
downloadffmpeg-56f7fda16b4fb12416a158fec8fdcb9cbf4b530e.tar.gz
reverse
Originally committed as revision 1479 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavcodec/a52dec.c12
-rw-r--r--libavcodec/liba52/a52.h14
-rw-r--r--libavcodec/liba52/parse.c14
3 files changed, 20 insertions, 20 deletions
diff --git a/libavcodec/a52dec.c b/libavcodec/a52dec.c
index c15c6eda43..7135948b12 100644
--- a/libavcodec/a52dec.c
+++ b/libavcodec/a52dec.c
@@ -98,12 +98,12 @@ static int a52_decode_init(AVCodecContext *avctx)
#else
/* static linked version */
s->handle = 0;
- s->a52_init = ff_a52_init;
- s->a52_samples = ff_a52_samples;
- s->a52_syncinfo = ff_a52_syncinfo;
- s->a52_frame = ff_a52_frame;
- s->a52_block = ff_a52_block;
- s->a52_free = ff_a52_free;
+ s->a52_init = a52_init;
+ s->a52_samples = a52_samples;
+ s->a52_syncinfo = a52_syncinfo;
+ s->a52_frame = a52_frame;
+ s->a52_block = a52_block;
+ s->a52_free = a52_free;
#endif
s->state = s->a52_init(0); /* later use CPU flags */
s->samples = s->a52_samples(s->state);
diff --git a/libavcodec/liba52/a52.h b/libavcodec/liba52/a52.h
index ee80821c41..ca3c9f1087 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
-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,
+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,
int * sample_rate, int * bit_rate);
-extern int ff_a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
+int a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
sample_t * level, sample_t bias);
-extern void ff_a52_dynrng (a52_state_t * state,
+void a52_dynrng (a52_state_t * state,
sample_t (* call) (sample_t, void *), void * data);
-extern int ff_a52_block (a52_state_t * state);
-extern void ff_a52_free (a52_state_t * state);
+int a52_block (a52_state_t * state);
+void a52_free (a52_state_t * state);
#endif /* A52_H */
diff --git a/libavcodec/liba52/parse.c b/libavcodec/liba52/parse.c
index 0a08bf48e1..59f21591b7 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 * ff_a52_init (uint32_t mm_accel)
+a52_state_t * a52_init (uint32_t mm_accel)
{
a52_state_t * state;
int i;
@@ -70,12 +70,12 @@ a52_state_t * ff_a52_init (uint32_t mm_accel)
return state;
}
-sample_t * ff_a52_samples (a52_state_t * state)
+sample_t * a52_samples (a52_state_t * state)
{
return state->samples;
}
-int ff_a52_syncinfo (uint8_t * buf, int * flags,
+int 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 ff_a52_syncinfo (uint8_t * buf, int * flags,
}
}
-int ff_a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
+int 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 ff_a52_frame (a52_state_t * state, uint8_t * buf, int * flags,
return 0;
}
-void ff_a52_dynrng (a52_state_t * state,
+void 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 ff_a52_block (a52_state_t * state)
+int 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 ff_a52_block (a52_state_t * state)
return 0;
}
-void ff_a52_free (a52_state_t * state)
+void a52_free (a52_state_t * state)
{
free (state->samples);
free (state);