diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:10:21 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:38 +0200 |
| commit | 3e2efacdd8a3ffb5d1c9004f112492b946284f9b (patch) | |
| tree | 11532872d32b303c6654955f4b0a1355a17e22e9 | |
| parent | 9cf0841ef35239660fc313314778414e2828f025 (diff) | |
libavcodec: Prefix fdct_ifast, fdct_ifast248
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/dct-test.c | 2 | ||||
| -rw-r--r-- | libavcodec/dsputil.c | 4 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 4 | ||||
| -rw-r--r-- | libavcodec/jfdctfst.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 6 |
5 files changed, 10 insertions, 10 deletions
diff --git a/libavcodec/dct-test.c b/libavcodec/dct-test.c index daa95bd0df..7aa2292987 100644 --- a/libavcodec/dct-test.c +++ b/libavcodec/dct-test.c @@ -87,7 +87,7 @@ static int cpu_flags; static const struct algo fdct_tab[] = { { "REF-DBL", ff_ref_fdct, NO_PERM }, { "FAAN", ff_faandct, FAAN_SCALE }, - { "IJG-AAN-INT", fdct_ifast, SCALE_PERM }, + { "IJG-AAN-INT", ff_fdct_ifast, SCALE_PERM }, { "IJG-LLM-INT", ff_jpeg_fdct_islow_8, NO_PERM }, #if HAVE_MMX diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index d91885327d..3a84cce750 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2796,8 +2796,8 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) c->fdct248 = ff_fdct248_islow_10; } else { if(avctx->dct_algo==FF_DCT_FASTINT) { - c->fdct = fdct_ifast; - c->fdct248 = fdct_ifast248; + c->fdct = ff_fdct_ifast; + c->fdct248 = ff_fdct_ifast248; } else if(avctx->dct_algo==FF_DCT_FAAN) { c->fdct = ff_faandct; diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index e915a82406..f79371295f 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -38,8 +38,8 @@ /* dct code */ typedef short DCTELEM; -void fdct_ifast (DCTELEM *data); -void fdct_ifast248 (DCTELEM *data); +void ff_fdct_ifast (DCTELEM *data); +void ff_fdct_ifast248 (DCTELEM *data); void ff_jpeg_fdct_islow_8(DCTELEM *data); void ff_jpeg_fdct_islow_10(DCTELEM *data); void ff_fdct248_islow_8(DCTELEM *data); diff --git a/libavcodec/jfdctfst.c b/libavcodec/jfdctfst.c index b8dc407f7b..3e30e5d535 100644 --- a/libavcodec/jfdctfst.c +++ b/libavcodec/jfdctfst.c @@ -205,7 +205,7 @@ static av_always_inline void row_fdct(DCTELEM * data){ */ GLOBAL(void) -fdct_ifast (DCTELEM * data) +ff_fdct_ifast (DCTELEM * data) { int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7; int tmp10, tmp11, tmp12, tmp13; @@ -271,7 +271,7 @@ fdct_ifast (DCTELEM * data) */ GLOBAL(void) -fdct_ifast248 (DCTELEM * data) +ff_fdct_ifast248 (DCTELEM * data) { int tmp0, tmp1, tmp2, tmp3, tmp4, tmp5, tmp6, tmp7; int tmp10, tmp11, tmp12, tmp13; diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5890f8c92e..ae1f39f1f5 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -89,7 +89,7 @@ void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], qmat[qscale][i] = (int)((UINT64_C(1) << QMAT_SHIFT) / (qscale * quant_matrix[j])); } - } else if (dsp->fdct == fdct_ifast + } else if (dsp->fdct == ff_fdct_ifast #ifndef FAAN_POSTSCALE || dsp->fdct == ff_faandct #endif @@ -132,7 +132,7 @@ void ff_convert_matrix(DSPContext *dsp, int (*qmat)[64], for (i = intra; i < 64; i++) { int64_t max = 8191; - if (dsp->fdct == fdct_ifast + if (dsp->fdct == ff_fdct_ifast #ifndef FAAN_POSTSCALE || dsp->fdct == ff_faandct #endif @@ -3370,7 +3370,7 @@ static int dct_quantize_trellis_c(MpegEncContext *s, int dct_coeff= FFABS(block[ scantable[i] ]); int best_score=256*256*256*120; - if ( s->dsp.fdct == fdct_ifast + if ( s->dsp.fdct == ff_fdct_ifast #ifndef FAAN_POSTSCALE || s->dsp.fdct == ff_faandct #endif |