[libav-devel] [PATCH 118/132] x86: dsputil: Replace silly mmx suffix on encoding init functions by x86

[Diego Biurrun]

---
 libavcodec/x86/dsputil_init.c   | 2 +-
 libavcodec/x86/dsputil_x86.h    | 4 ++--
 libavcodec/x86/dsputilenc_mmx.c | 4 ++--
 libavcodec/x86/motion_est.c     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c
index 137f925..4b4ab83 100644
--- a/libavcodec/x86/dsputil_init.c
+++ b/libavcodec/x86/dsputil_init.c
@@ -28,5 +28,5 @@ av_cold void ff_dsputil_init_x86(DSPContext *c, 
AVCodecContext *avctx,
                                  unsigned high_bit_depth)
 {
     if (CONFIG_ENCODERS)
-        ff_dsputilenc_init_mmx(c, avctx, high_bit_depth);
+        ff_dsputilenc_init_x86(c, avctx, high_bit_depth);
 }
diff --git a/libavcodec/x86/dsputil_x86.h b/libavcodec/x86/dsputil_x86.h
index b6bddf2..d346f83 100644
--- a/libavcodec/x86/dsputil_x86.h
+++ b/libavcodec/x86/dsputil_x86.h
@@ -27,8 +27,8 @@
 #include "libavcodec/avcodec.h"
 #include "libavcodec/dsputil.h"
 
-void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx,
+void ff_dsputilenc_init_x86(DSPContext *c, AVCodecContext *avctx,
                             unsigned high_bit_depth);
-void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx);
+void ff_dsputil_init_pix_x86(DSPContext *c, AVCodecContext *avctx);
 
 #endif /* AVCODEC_X86_DSPUTIL_X86_H */
diff --git a/libavcodec/x86/dsputilenc_mmx.c b/libavcodec/x86/dsputilenc_mmx.c
index 99feafc..2384fbf 100644
--- a/libavcodec/x86/dsputilenc_mmx.c
+++ b/libavcodec/x86/dsputilenc_mmx.c
@@ -818,7 +818,7 @@ hadamard_func(mmxext)
 hadamard_func(sse2)
 hadamard_func(ssse3)
 
-av_cold void ff_dsputilenc_init_mmx(DSPContext *c, AVCodecContext *avctx,
+av_cold void ff_dsputilenc_init_x86(DSPContext *c, AVCodecContext *avctx,
                                     unsigned high_bit_depth)
 {
     int cpu_flags = av_get_cpu_flags();
@@ -882,5 +882,5 @@ av_cold void ff_dsputilenc_init_mmx(DSPContext *c, 
AVCodecContext *avctx,
         c->hadamard8_diff[1] = ff_hadamard8_diff_ssse3;
     }
 
-    ff_dsputil_init_pix_mmx(c, avctx);
+    ff_dsputil_init_pix_x86(c, avctx);
 }
diff --git a/libavcodec/x86/motion_est.c b/libavcodec/x86/motion_est.c
index 2b34a28..788095a 100644
--- a/libavcodec/x86/motion_est.c
+++ b/libavcodec/x86/motion_est.c
@@ -446,7 +446,7 @@ PIX_SAD(mmxext)
 
 #endif /* HAVE_INLINE_ASM */
 
-av_cold void ff_dsputil_init_pix_mmx(DSPContext *c, AVCodecContext *avctx)
+av_cold void ff_dsputil_init_pix_x86(DSPContext *c, AVCodecContext *avctx)
 {
 #if HAVE_INLINE_ASM
     int cpu_flags = av_get_cpu_flags();
-- 
1.8.3.2

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel