[x264-devel] ppc: Adjust AltiVec function suffix

[Vittorio Giovara]

x264 | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Thu Jan 19 17:43:57 2017 +0100| [5e1ed367d725f895eeadf358861ab52521a420d3] | committer: Henrik Gramner

ppc: Adjust AltiVec function suffix

Architecture should always be the last element.

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=5e1ed367d725f895eeadf358861ab52521a420d3
---

 common/mc.c        |  2 +-
 common/pixel.c     |  2 +-
 common/ppc/mc.c    | 10 +++++-----
 common/ppc/mc.h    |  2 +-
 common/ppc/pixel.c |  2 +-
 common/ppc/pixel.h |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/common/mc.c b/common/mc.c
index 9940648..543a05c 100644
--- a/common/mc.c
+++ b/common/mc.c
@@ -676,7 +676,7 @@ void x264_mc_init( int cpu, x264_mc_functions_t *pf, int cpu_independent )
 #endif
 #if HAVE_ALTIVEC
     if( cpu&X264_CPU_ALTIVEC )
-        x264_mc_altivec_init( pf );
+        x264_mc_init_altivec( pf );
 #endif
 #if HAVE_ARMV6
     x264_mc_init_arm( cpu, pf );
diff --git a/common/pixel.c b/common/pixel.c
index 2828ff8..c5edc9e 100644
--- a/common/pixel.c
+++ b/common/pixel.c
@@ -1491,7 +1491,7 @@ void x264_pixel_init( int cpu, x264_pixel_function_t *pixf )
 #if HAVE_ALTIVEC
     if( cpu&X264_CPU_ALTIVEC )
     {
-        x264_pixel_altivec_init( pixf );
+        x264_pixel_init_altivec( pixf );
     }
 #endif
 
diff --git a/common/ppc/mc.c b/common/ppc/mc.c
index 92b66a5..08998f2 100644
--- a/common/ppc/mc.c
+++ b/common/ppc/mc.c
@@ -326,7 +326,7 @@ static void mc_chroma_2xh( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_stride,
 #define VSLD(a,b,n) vec_sld(b,a,16-n)
 #endif
 
-static void mc_chroma_altivec_4xh( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_stride,
+static void mc_chroma_4xh_altivec( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_stride,
                                    uint8_t *src, intptr_t i_src_stride,
                                    int mvx, int mvy, int i_height )
 {
@@ -417,7 +417,7 @@ static void mc_chroma_altivec_4xh( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_
     }
 }
 
-static void mc_chroma_altivec_8xh( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_stride,
+static void mc_chroma_8xh_altivec( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_stride,
                                    uint8_t *src, intptr_t i_src_stride,
                                    int mvx, int mvy, int i_height )
 {
@@ -548,10 +548,10 @@ static void mc_chroma_altivec( uint8_t *dstu, uint8_t *dstv, intptr_t i_dst_stri
                                int mvx, int mvy, int i_width, int i_height )
 {
     if( i_width == 8 )
-        mc_chroma_altivec_8xh( dstu, dstv, i_dst_stride, src, i_src_stride,
+        mc_chroma_8xh_altivec( dstu, dstv, i_dst_stride, src, i_src_stride,
                                mvx, mvy, i_height );
     else if( i_width == 4 )
-        mc_chroma_altivec_4xh( dstu, dstv, i_dst_stride, src, i_src_stride,
+        mc_chroma_4xh_altivec( dstu, dstv, i_dst_stride, src, i_src_stride,
                                mvx, mvy, i_height );
     else
         mc_chroma_2xh( dstu, dstv, i_dst_stride, src, i_src_stride,
@@ -1214,7 +1214,7 @@ PLANE_COPY_SWAP(16, altivec)
 PLANE_INTERLEAVE(altivec)
 #endif // !HIGH_BIT_DEPTH
 
-void x264_mc_altivec_init( x264_mc_functions_t *pf )
+void x264_mc_init_altivec( x264_mc_functions_t *pf )
 {
 #if !HIGH_BIT_DEPTH
     pf->mc_luma   = mc_luma_altivec;
diff --git a/common/ppc/mc.h b/common/ppc/mc.h
index 5ae9466..f31bb39 100644
--- a/common/ppc/mc.h
+++ b/common/ppc/mc.h
@@ -26,6 +26,6 @@
 #ifndef X264_PPC_MC_H
 #define X264_PPC_MC_H
 
-void x264_mc_altivec_init( x264_mc_functions_t *pf );
+void x264_mc_init_altivec( x264_mc_functions_t *pf );
 
 #endif
diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
index dad0a1c..04ad435 100644
--- a/common/ppc/pixel.c
+++ b/common/ppc/pixel.c
@@ -1774,7 +1774,7 @@ INTRA_MBCMP(satd, 16, v, h, dc, )
 /****************************************************************************
  * x264_pixel_init:
  ****************************************************************************/
-void x264_pixel_altivec_init( x264_pixel_function_t *pixf )
+void x264_pixel_init_altivec( x264_pixel_function_t *pixf )
 {
 #if !HIGH_BIT_DEPTH
     pixf->sad[PIXEL_16x16]  = pixel_sad_16x16_altivec;
diff --git a/common/ppc/pixel.h b/common/ppc/pixel.h
index c7e13f8..84a4973 100644
--- a/common/ppc/pixel.h
+++ b/common/ppc/pixel.h
@@ -26,6 +26,6 @@
 #ifndef X264_PPC_PIXEL_H
 #define X264_PPC_PIXEL_H
 
-void x264_pixel_altivec_init( x264_pixel_function_t *pixf );
+void x264_pixel_init_altivec( x264_pixel_function_t *pixf );
 
 #endif