diff options
| -rw-r--r-- | libavcodec/atrac.c | 4 | ||||
| -rw-r--r-- | libavcodec/atrac.h | 4 | ||||
| -rw-r--r-- | libavcodec/atrac1.c | 6 | ||||
| -rw-r--r-- | libavcodec/atrac3.c | 8 | ||||
| -rw-r--r-- | libavcodec/dnxhdenc.c | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_common.h | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
7 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/atrac.c b/libavcodec/atrac.c index da6cd305fb..b9b33aad48 100644 --- a/libavcodec/atrac.c +++ b/libavcodec/atrac.c @@ -48,7 +48,7 @@ static const float qmf_48tap_half[24] = { * Generate common tables */ -void atrac_generate_tables(void) +void ff_atrac_generate_tables(void) { int i; float s; @@ -79,7 +79,7 @@ void atrac_generate_tables(void) */ -void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp) +void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp) { int i, j; float *p1, *p3; diff --git a/libavcodec/atrac.h b/libavcodec/atrac.h index 2223a5e620..39fb331ca7 100644 --- a/libavcodec/atrac.h +++ b/libavcodec/atrac.h @@ -30,7 +30,7 @@ extern float ff_atrac_sf_table[64]; -void atrac_generate_tables(void); -void atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp); +void ff_atrac_generate_tables(void); +void ff_atrac_iqmf (float *inlo, float *inhi, unsigned int nIn, float *pOut, float *delayBuf, float *temp); #endif /* AVCODEC_ATRAC_H */ diff --git a/libavcodec/atrac1.c b/libavcodec/atrac1.c index 9ead80d5c8..7078ce6a85 100644 --- a/libavcodec/atrac1.c +++ b/libavcodec/atrac1.c @@ -262,14 +262,14 @@ static void at1_subband_synthesis(AT1Ctx *q, AT1SUCtx* su, float *pOut) float iqmf_temp[512 + 46]; /* combine low and middle bands */ - atrac_iqmf(q->bands[0], q->bands[1], 128, temp, su->fst_qmf_delay, iqmf_temp); + ff_atrac_iqmf(q->bands[0], q->bands[1], 128, temp, su->fst_qmf_delay, iqmf_temp); /* delay the signal of the high band by 23 samples */ memcpy( su->last_qmf_delay, &su->last_qmf_delay[256], sizeof(float) * 23); memcpy(&su->last_qmf_delay[23], q->bands[2], sizeof(float) * 256); /* combine (low + middle) and high bands */ - atrac_iqmf(temp, su->last_qmf_delay, 256, pOut, su->snd_qmf_delay, iqmf_temp); + ff_atrac_iqmf(temp, su->last_qmf_delay, 256, pOut, su->snd_qmf_delay, iqmf_temp); } @@ -378,7 +378,7 @@ static av_cold int atrac1_decode_init(AVCodecContext *avctx) ff_init_ff_sine_windows(5); - atrac_generate_tables(); + ff_atrac_generate_tables(); dsputil_init(&q->dsp, avctx); ff_fmt_convert_init(&q->fmt_conv, avctx); diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c index 6dec6a3abe..c588c07d8f 100644 --- a/libavcodec/atrac3.c +++ b/libavcodec/atrac3.c @@ -812,9 +812,9 @@ static int decodeFrame(ATRAC3Context *q, const uint8_t* databuf, p2= p1+256; p3= p2+256; p4= p3+256; - atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf); - atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf); - atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf); + ff_atrac_iqmf (p1, p2, 256, p1, q->pUnits[i].delayBuf1, q->tempBuf); + ff_atrac_iqmf (p4, p3, 256, p3, q->pUnits[i].delayBuf2, q->tempBuf); + ff_atrac_iqmf (p1, p3, 512, p1, q->pUnits[i].delayBuf3, q->tempBuf); } return 0; @@ -1014,7 +1014,7 @@ static av_cold int atrac3_decode_init(AVCodecContext *avctx) return ret; } - atrac_generate_tables(); + ff_atrac_generate_tables(); /* Generate gain tables. */ for (i=0 ; i<16 ; i++) diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c index 322151324c..0780878d07 100644 --- a/libavcodec/dnxhdenc.c +++ b/libavcodec/dnxhdenc.c @@ -264,7 +264,7 @@ static int dnxhd_encode_init(AVCodecContext *avctx) dsputil_init(&ctx->m.dsp, avctx); ff_dct_common_init(&ctx->m); if (!ctx->m.dct_quantize) - ctx->m.dct_quantize = dct_quantize_c; + ctx->m.dct_quantize = ff_dct_quantize_c; if (ctx->cid_table->bit_depth == 10) { ctx->m.dct_quantize = dnxhd_10bit_dct_quantize; diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h index faa50e6ef0..5612d4e025 100644 --- a/libavcodec/mpegvideo_common.h +++ b/libavcodec/mpegvideo_common.h @@ -39,7 +39,7 @@ #include "faandct.h" #include <limits.h> -int dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); +int ff_dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow); /** * Set the given MpegEncContext to common defaults (same for encoding and decoding). diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 709b3df51e..5890f8c92e 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -768,7 +768,7 @@ av_cold int MPV_encode_init(AVCodecContext *avctx) return -1; if (!s->dct_quantize) - s->dct_quantize = dct_quantize_c; + s->dct_quantize = ff_dct_quantize_c; if (!s->denoise_dct) s->denoise_dct = denoise_dct_c; s->fast_dct_quantize = s->dct_quantize; @@ -1976,7 +1976,7 @@ static av_always_inline void encode_mb_internal(MpegEncContext *s, } // non c quantize code returns incorrect block_last_index FIXME - if (s->alternate_scan && s->dct_quantize != dct_quantize_c) { + if (s->alternate_scan && s->dct_quantize != ff_dct_quantize_c) { for (i = 0; i < mb_block_count; i++) { int j; if (s->block_last_index[i] > 0) { @@ -3940,7 +3940,7 @@ STOP_TIMER("iterative search") return last_non_zero; } -int dct_quantize_c(MpegEncContext *s, +int ff_dct_quantize_c(MpegEncContext *s, DCTELEM *block, int n, int qscale, int *overflow) { |