aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2011-01-25 20:07:07 +0000
committerMans Rullgard <mans@mansr.com>2011-01-26 15:35:27 +0000
commit4c57cde942b3d28074d0bb06e2ca200bc1098f22 (patch)
tree7d7afe405467d5a2679396bc4036f06b6fcc0566
parent24e3ad3031fa26e12d4b939f0ff0dd6e12f05ef5 (diff)
downloadffmpeg-4c57cde942b3d28074d0bb06e2ca200bc1098f22.tar.gz
Add ff_ prefix to ac3_common_init().
Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/ac3.c2
-rw-r--r--libavcodec/ac3.h2
-rw-r--r--libavcodec/ac3dec.c2
-rw-r--r--libavcodec/ac3enc.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 8fa60e67d5..23eee52661 100644
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -241,7 +241,7 @@ void ff_ac3_bit_alloc_calc_bap(int16_t *mask, int16_t *psd, int start, int end,
* note: This function must remain thread safe because it is called by the
* AVParser init code.
*/
-av_cold void ac3_common_init(void)
+av_cold void ff_ac3_common_init(void)
{
#if !CONFIG_HARDCODED_TABLES
/* compute bin_to_band_tab from band_start_tab */
diff --git a/libavcodec/ac3.h b/libavcodec/ac3.h
index 283b134329..405e3cd0a3 100644
--- a/libavcodec/ac3.h
+++ b/libavcodec/ac3.h
@@ -115,7 +115,7 @@ typedef enum {
EAC3_FRAME_TYPE_RESERVED
} EAC3FrameType;
-void ac3_common_init(void);
+void ff_ac3_common_init(void);
/**
* Calculate the log power-spectral density of the input signal.
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 32172dc906..33c5f742e5 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -187,7 +187,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx)
AC3DecodeContext *s = avctx->priv_data;
s->avctx = avctx;
- ac3_common_init();
+ ff_ac3_common_init();
ac3_tables_init();
ff_mdct_init(&s->imdct_256, 8, 1, 1.0);
ff_mdct_init(&s->imdct_512, 9, 1, 1.0);
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index f058d79882..ed7a171ac7 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -1815,7 +1815,7 @@ static av_cold int ac3_encode_init(AVCodecContext *avctx)
avctx->frame_size = AC3_FRAME_SIZE;
- ac3_common_init();
+ ff_ac3_common_init();
ret = validate_options(avctx, s);
if (ret)