Signed-off-by: Mans Rullgard <mans@mansr.com>tags/n0.8
@@ -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 | * note: This function must remain thread safe because it is called by the | ||||
* AVParser init code. | * AVParser init code. | ||||
*/ | */ | ||||
av_cold void ac3_common_init(void) | |||||
av_cold void ff_ac3_common_init(void) | |||||
{ | { | ||||
#if !CONFIG_HARDCODED_TABLES | #if !CONFIG_HARDCODED_TABLES | ||||
/* compute bin_to_band_tab from band_start_tab */ | /* compute bin_to_band_tab from band_start_tab */ | ||||
@@ -115,7 +115,7 @@ typedef enum { | |||||
EAC3_FRAME_TYPE_RESERVED | EAC3_FRAME_TYPE_RESERVED | ||||
} EAC3FrameType; | } EAC3FrameType; | ||||
void ac3_common_init(void); | |||||
void ff_ac3_common_init(void); | |||||
/** | /** | ||||
* Calculate the log power-spectral density of the input signal. | * Calculate the log power-spectral density of the input signal. | ||||
@@ -187,7 +187,7 @@ static av_cold int ac3_decode_init(AVCodecContext *avctx) | |||||
AC3DecodeContext *s = avctx->priv_data; | AC3DecodeContext *s = avctx->priv_data; | ||||
s->avctx = avctx; | s->avctx = avctx; | ||||
ac3_common_init(); | |||||
ff_ac3_common_init(); | |||||
ac3_tables_init(); | ac3_tables_init(); | ||||
ff_mdct_init(&s->imdct_256, 8, 1, 1.0); | ff_mdct_init(&s->imdct_256, 8, 1, 1.0); | ||||
ff_mdct_init(&s->imdct_512, 9, 1, 1.0); | ff_mdct_init(&s->imdct_512, 9, 1, 1.0); | ||||
@@ -1815,7 +1815,7 @@ static av_cold int ac3_encode_init(AVCodecContext *avctx) | |||||
avctx->frame_size = AC3_FRAME_SIZE; | avctx->frame_size = AC3_FRAME_SIZE; | ||||
ac3_common_init(); | |||||
ff_ac3_common_init(); | |||||
ret = validate_options(avctx, s); | ret = validate_options(avctx, s); | ||||
if (ret) | if (ret) | ||||