diff options
| author | Martin Storsjö <martin@martin.st> | 2012-02-15 12:06:44 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:06:34 +0200 |
| commit | 9cf0841ef35239660fc313314778414e2828f025 (patch) | |
| tree | 97c8fcbdfacc747aca91ebc43843f52a17b12085 /libavcodec/x86 | |
| parent | 99560a4caab1a0a13504fe0897481d7c98b432fb (diff) | |
| download | ffmpeg-9cf0841ef35239660fc313314778414e2828f025.tar.gz | |
dsputil: Add ff_ prefix to the dsputil*_init* functions
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.h | 4 | ||||
| -rw-r--r-- | libavcodec/x86/dsputilenc_mmx.c | 4 | ||||
| -rw-r--r-- | libavcodec/x86/motion_est_mmx.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index c40cab51f0..2a8cad15cf 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -2336,7 +2336,7 @@ extern void ff_butterflies_float_interleave_sse(float *dst, const float *src0, extern void ff_butterflies_float_interleave_avx(float *dst, const float *src0, const float *src1, int len); -void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) +void ff_dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); const int high_bit_depth = avctx->bits_per_raw_sample > 8; @@ -2844,5 +2844,5 @@ void dsputil_init_mmx(DSPContext* c, AVCodecContext *avctx) } if (CONFIG_ENCODERS) - dsputilenc_init_mmx(c, avctx); + ff_dsputilenc_init_mmx(c, avctx); } diff --git a/libavcodec/x86/dsputil_mmx.h b/libavcodec/x86/dsputil_mmx.h index 7ab55e7c51..097739cf98 100644 --- a/libavcodec/x86/dsputil_mmx.h +++ b/libavcodec/x86/dsputil_mmx.h @@ -184,8 +184,8 @@ static inline void transpose4x4(uint8_t *dst, uint8_t *src, x86_reg dst_stride, "pcmpeqd %%" #regd ", %%" #regd " \n\t" \ "psrlw $15, %%" #regd ::) -void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); -void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); +void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx); +void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx); void ff_add_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); void ff_put_pixels_clamped_mmx(const DCTELEM *block, uint8_t *pixels, int line_size); diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c index 7362234c86..2a403ba019 100644 --- a/libavcodec/x86/dsputilenc_mmx.c +++ b/libavcodec/x86/dsputilenc_mmx.c @@ -1095,7 +1095,7 @@ static int ssd_int8_vs_int16_mmx(const int8_t *pix1, const int16_t *pix2, int si #endif //HAVE_SSSE3 -void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) +void ff_dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); int bit_depth = avctx->bits_per_raw_sample; @@ -1192,5 +1192,5 @@ void dsputilenc_init_mmx(DSPContext* c, AVCodecContext *avctx) } } - dsputil_init_pix_mmx(c, avctx); + ff_dsputil_init_pix_mmx(c, avctx); } diff --git a/libavcodec/x86/motion_est_mmx.c b/libavcodec/x86/motion_est_mmx.c index 948af98ffb..a522a5e7ff 100644 --- a/libavcodec/x86/motion_est_mmx.c +++ b/libavcodec/x86/motion_est_mmx.c @@ -422,7 +422,7 @@ static int sad16_xy2_ ## suf(void *v, uint8_t *blk2, uint8_t *blk1, int stride, PIX_SAD(mmx) PIX_SAD(mmx2) -void dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx) +void ff_dsputil_init_pix_mmx(DSPContext* c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); |