diff options
author | Martin Storsjö <martin@martin.st> | 2012-02-15 14:42:56 +0200 |
---|---|---|
committer | Martin Storsjö <martin@martin.st> | 2012-02-15 22:07:29 +0200 |
commit | 210f72845c11fbab7b913a4f18ffd67e99d2dd4f (patch) | |
tree | 080ff729d3f93d6b45f02f90a3e245e9da0a5604 | |
parent | f73673a770215f2f601ebb6e75d264533f738cc4 (diff) | |
download | ffmpeg-210f72845c11fbab7b913a4f18ffd67e99d2dd4f.tar.gz |
ppc: Add ff_ prefix to nonstatic symbols
Signed-off-by: Martin Storsjö <martin@martin.st>
-rw-r--r-- | libavcodec/ppc/dsputil_altivec.c | 10 | ||||
-rw-r--r-- | libavcodec/ppc/dsputil_altivec.h | 18 | ||||
-rw-r--r-- | libavcodec/ppc/dsputil_ppc.c | 12 | ||||
-rw-r--r-- | libavcodec/ppc/fdct_altivec.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/float_altivec.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/gmc_altivec.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/h264_altivec.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/idct_altivec.c | 4 | ||||
-rw-r--r-- | libavcodec/ppc/int_altivec.c | 2 | ||||
-rw-r--r-- | libavcodec/ppc/vp8dsp_altivec.c | 2 |
10 files changed, 28 insertions, 28 deletions
diff --git a/libavcodec/ppc/dsputil_altivec.c b/libavcodec/ppc/dsputil_altivec.c index 20bff45c9c..d27a2bc836 100644 --- a/libavcodec/ppc/dsputil_altivec.c +++ b/libavcodec/ppc/dsputil_altivec.c @@ -609,7 +609,7 @@ static void add_bytes_altivec(uint8_t *dst, uint8_t *src, int w) { } /* next one assumes that ((line_size % 16) == 0) */ -void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h) +void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h) { register vector unsigned char pixelsv1, pixelsv2; register vector unsigned char pixelsv1B, pixelsv2B; @@ -651,7 +651,7 @@ void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, /* next one assumes that ((line_size % 16) == 0) */ #define op_avg(a,b) a = ( ((a)|(b)) - ((((a)^(b))&0xFEFEFEFEUL)>>1) ) -void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h) +void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h) { register vector unsigned char pixelsv1, pixelsv2, pixelsv, blockv; register vector unsigned char perm = vec_lvsl(0, pixels); @@ -1391,10 +1391,10 @@ void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx) if (!high_bit_depth) { c->get_pixels = get_pixels_altivec; c->clear_block = clear_block_altivec; - c->put_pixels_tab[0][0] = put_pixels16_altivec; + c->put_pixels_tab[0][0] = ff_put_pixels16_altivec; /* the two functions do the same thing, so use the same code */ - c->put_no_rnd_pixels_tab[0][0] = put_pixels16_altivec; - c->avg_pixels_tab[0][0] = avg_pixels16_altivec; + c->put_no_rnd_pixels_tab[0][0] = ff_put_pixels16_altivec; + c->avg_pixels_tab[0][0] = ff_avg_pixels16_altivec; c->avg_pixels_tab[1][0] = avg_pixels8_altivec; c->avg_pixels_tab[1][3] = avg_pixels8_xy2_altivec; c->put_pixels_tab[1][3] = put_pixels8_xy2_altivec; diff --git a/libavcodec/ppc/dsputil_altivec.h b/libavcodec/ppc/dsputil_altivec.h index 6040be1c17..63bb7602f8 100644 --- a/libavcodec/ppc/dsputil_altivec.h +++ b/libavcodec/ppc/dsputil_altivec.h @@ -26,15 +26,15 @@ #include <stdint.h> #include "libavcodec/dsputil.h" -void put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); +void ff_put_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); -void avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); +void ff_avg_pixels16_altivec(uint8_t *block, const uint8_t *pixels, int line_size, int h); -void fdct_altivec(int16_t *block); -void gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h, - int x16, int y16, int rounder); -void idct_put_altivec(uint8_t *dest, int line_size, int16_t *block); -void idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); +void ff_fdct_altivec(int16_t *block); +void ff_gmc1_altivec(uint8_t *dst, uint8_t *src, int stride, int h, + int x16, int y16, int rounder); +void ff_idct_put_altivec(uint8_t *dest, int line_size, int16_t *block); +void ff_idct_add_altivec(uint8_t *dest, int line_size, int16_t *block); void ff_vp3_idct_altivec(DCTELEM *block); void ff_vp3_idct_put_altivec(uint8_t *dest, int line_size, DCTELEM *block); @@ -43,7 +43,7 @@ void ff_vp3_idct_add_altivec(uint8_t *dest, int line_size, DCTELEM *block); void ff_dsputil_h264_init_ppc(DSPContext* c, AVCodecContext *avctx); void ff_dsputil_init_altivec(DSPContext* c, AVCodecContext *avctx); -void float_init_altivec(DSPContext* c, AVCodecContext *avctx); -void int_init_altivec(DSPContext* c, AVCodecContext *avctx); +void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx); +void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx); #endif /* AVCODEC_PPC_DSPUTIL_ALTIVEC_H */ diff --git a/libavcodec/ppc/dsputil_ppc.c b/libavcodec/ppc/dsputil_ppc.c index b64c1dc03b..ab8f7aef48 100644 --- a/libavcodec/ppc/dsputil_ppc.c +++ b/libavcodec/ppc/dsputil_ppc.c @@ -167,23 +167,23 @@ void ff_dsputil_init_ppc(DSPContext* c, AVCodecContext *avctx) if (av_get_cpu_flags() & AV_CPU_FLAG_ALTIVEC) { ff_dsputil_init_altivec(c, avctx); - float_init_altivec(c, avctx); - int_init_altivec(c, avctx); - c->gmc1 = gmc1_altivec; + ff_float_init_altivec(c, avctx); + ff_int_init_altivec(c, avctx); + c->gmc1 = ff_gmc1_altivec; #if CONFIG_ENCODERS if (avctx->bits_per_raw_sample <= 8 && (avctx->dct_algo == FF_DCT_AUTO || avctx->dct_algo == FF_DCT_ALTIVEC)) { - c->fdct = fdct_altivec; + c->fdct = ff_fdct_altivec; } #endif //CONFIG_ENCODERS if (avctx->lowres == 0 && avctx->bits_per_raw_sample <= 8) { if ((avctx->idct_algo == FF_IDCT_AUTO) || (avctx->idct_algo == FF_IDCT_ALTIVEC)) { - c->idct_put = idct_put_altivec; - c->idct_add = idct_add_altivec; + c->idct_put = ff_idct_put_altivec; + c->idct_add = ff_idct_add_altivec; c->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; }else if((CONFIG_VP3_DECODER || CONFIG_VP5_DECODER || CONFIG_VP6_DECODER) && avctx->idct_algo==FF_IDCT_VP3){ diff --git a/libavcodec/ppc/fdct_altivec.c b/libavcodec/ppc/fdct_altivec.c index 2644c96789..0e3658dd2f 100644 --- a/libavcodec/ppc/fdct_altivec.c +++ b/libavcodec/ppc/fdct_altivec.c @@ -195,7 +195,7 @@ static vector float fdctconsts[3] = { /* two dimensional discrete cosine transform */ -void fdct_altivec(int16_t *block) +void ff_fdct_altivec(int16_t *block) { vector signed short *bp; vector float *cp; diff --git a/libavcodec/ppc/float_altivec.c b/libavcodec/ppc/float_altivec.c index e4010694a2..8253716caa 100644 --- a/libavcodec/ppc/float_altivec.c +++ b/libavcodec/ppc/float_altivec.c @@ -122,7 +122,7 @@ static void vector_fmul_window_altivec(float *dst, const float *src0, const floa } } -void float_init_altivec(DSPContext* c, AVCodecContext *avctx) +void ff_float_init_altivec(DSPContext* c, AVCodecContext *avctx) { c->vector_fmul = vector_fmul_altivec; c->vector_fmul_reverse = vector_fmul_reverse_altivec; diff --git a/libavcodec/ppc/gmc_altivec.c b/libavcodec/ppc/gmc_altivec.c index 0ed70ab83b..965921ab7f 100644 --- a/libavcodec/ppc/gmc_altivec.c +++ b/libavcodec/ppc/gmc_altivec.c @@ -29,7 +29,7 @@ altivec-enhanced gmc1. ATM this code assume stride is a multiple of 8, to preserve proper dst alignment. */ -void gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, int stride, int h, int x16, int y16, int rounder) +void ff_gmc1_altivec(uint8_t *dst /* align 8 */, uint8_t *src /* align1 */, int stride, int h, int x16, int y16, int rounder) { const DECLARE_ALIGNED(16, unsigned short, rounder_a) = rounder; const DECLARE_ALIGNED(16, unsigned short, ABCD)[8] = diff --git a/libavcodec/ppc/h264_altivec.c b/libavcodec/ppc/h264_altivec.c index 6013712bdd..79e1714f4e 100644 --- a/libavcodec/ppc/h264_altivec.c +++ b/libavcodec/ppc/h264_altivec.c @@ -72,7 +72,7 @@ #define H264_MC(OPNAME, SIZE, CODETYPE) \ static void OPNAME ## h264_qpel ## SIZE ## _mc00_ ## CODETYPE (uint8_t *dst, uint8_t *src, int stride){\ - OPNAME ## pixels ## SIZE ## _ ## CODETYPE(dst, src, stride, SIZE);\ + ff_ ## OPNAME ## pixels ## SIZE ## _ ## CODETYPE(dst, src, stride, SIZE);\ }\ \ static void OPNAME ## h264_qpel ## SIZE ## _mc10_ ## CODETYPE(uint8_t *dst, uint8_t *src, int stride){ \ diff --git a/libavcodec/ppc/idct_altivec.c b/libavcodec/ppc/idct_altivec.c index 068cf42396..d2e9017da4 100644 --- a/libavcodec/ppc/idct_altivec.c +++ b/libavcodec/ppc/idct_altivec.c @@ -158,7 +158,7 @@ static const vec_s16 constants[5] = { {19266, 26722, 25172, 22654, 19266, 22654, 25172, 26722} }; -void idct_put_altivec(uint8_t* dest, int stride, int16_t *blk) +void ff_idct_put_altivec(uint8_t* dest, int stride, int16_t *blk) { vec_s16 *block = (vec_s16*)blk; vec_u8 tmp; @@ -180,7 +180,7 @@ void idct_put_altivec(uint8_t* dest, int stride, int16_t *blk) COPY (dest, vx7) } -void idct_add_altivec(uint8_t* dest, int stride, int16_t *blk) +void ff_idct_add_altivec(uint8_t* dest, int stride, int16_t *blk) { vec_s16 *block = (vec_s16*)blk; vec_u8 tmp; diff --git a/libavcodec/ppc/int_altivec.c b/libavcodec/ppc/int_altivec.c index 25cbb8f771..ce996fa68a 100644 --- a/libavcodec/ppc/int_altivec.c +++ b/libavcodec/ppc/int_altivec.c @@ -144,7 +144,7 @@ static int32_t scalarproduct_and_madd_int16_altivec(int16_t *v1, const int16_t * return ires; } -void int_init_altivec(DSPContext* c, AVCodecContext *avctx) +void ff_int_init_altivec(DSPContext* c, AVCodecContext *avctx) { c->ssd_int8_vs_int16 = ssd_int8_vs_int16_altivec; c->scalarproduct_int16 = scalarproduct_int16_altivec; diff --git a/libavcodec/ppc/vp8dsp_altivec.c b/libavcodec/ppc/vp8dsp_altivec.c index bdda7df505..9c0f663a71 100644 --- a/libavcodec/ppc/vp8dsp_altivec.c +++ b/libavcodec/ppc/vp8dsp_altivec.c @@ -268,7 +268,7 @@ EPEL_HV(4, 4,4) static void put_vp8_pixels16_altivec(uint8_t *dst, int stride, uint8_t *src, int s, int h, int mx, int my) { - put_pixels16_altivec(dst, src, stride, h); + ff_put_pixels16_altivec(dst, src, stride, h); } av_cold void ff_vp8dsp_init_altivec(VP8DSPContext *c) |