[FFmpeg-devel] [PATCH] diracdsp: Make x86 files/functions names consistent

[Timothy Gu]

---
 libavcodec/diracdsp.c                              | 5 +++--
 libavcodec/x86/Makefile                            | 2 +-
 libavcodec/x86/{diracdsp_yasm.asm => diracdsp.asm} | 0
 libavcodec/x86/{diracdsp_mmx.h => diracdsp.h}      | 2 +-
 libavcodec/x86/{diracdsp_mmx.c => diracdsp_init.c} | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)
 rename libavcodec/x86/{diracdsp_yasm.asm => diracdsp.asm} (100%)
 rename libavcodec/x86/{diracdsp_mmx.h => diracdsp.h} (97%)
 rename libavcodec/x86/{diracdsp_mmx.c => diracdsp_init.c} (98%)

diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c
index 12f27ce..a8cfed0 100644
--- a/libavcodec/diracdsp.c
+++ b/libavcodec/diracdsp.c
@@ -20,7 +20,7 @@
 
 #include "avcodec.h"
 #include "diracdsp.h"
-#include "libavcodec/x86/diracdsp_mmx.h"
+#include "libavcodec/x86/diracdsp.h"
 
 #define FILTER(src, stride)                                     \
     ((21*((src)[ 0*stride] + (src)[1*stride])                   \
@@ -222,5 +222,6 @@ av_cold void ff_diracdsp_init(DiracDSPContext *c)
     PIXFUNC(avg, 16);
     PIXFUNC(avg, 32);
 
-    if (HAVE_MMX && HAVE_YASM) ff_diracdsp_init_mmx(c);
+    if (ARCH_X86)
+        ff_diracdsp_init_x86(c);
 }
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index ce06b90..d7f257f 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -133,7 +133,7 @@ YASM-OBJS-$(CONFIG_ADPCM_G722_ENCODER) += x86/g722dsp.o
 YASM-OBJS-$(CONFIG_ALAC_DECODER)       += x86/alacdsp.o
 YASM-OBJS-$(CONFIG_APNG_DECODER)       += x86/pngdsp.o
 YASM-OBJS-$(CONFIG_DCA_DECODER)        += x86/synth_filter.o
-YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp_mmx.o x86/diracdsp_yasm.o \
+YASM-OBJS-$(CONFIG_DIRAC_DECODER)      += x86/diracdsp.o x86/diracdsp.o \
                                           x86/dwt_yasm.o
 YASM-OBJS-$(CONFIG_DNXHD_ENCODER)      += x86/dnxhdenc.o
 YASM-OBJS-$(CONFIG_FLAC_DECODER)       += x86/flacdsp.o
diff --git a/libavcodec/x86/diracdsp_yasm.asm b/libavcodec/x86/diracdsp.asm
similarity index 100%
rename from libavcodec/x86/diracdsp_yasm.asm
rename to libavcodec/x86/diracdsp.asm
diff --git a/libavcodec/x86/diracdsp_mmx.h b/libavcodec/x86/diracdsp.h
similarity index 97%
rename from libavcodec/x86/diracdsp_mmx.h
rename to libavcodec/x86/diracdsp.h
index d15dc91..f247705 100644
--- a/libavcodec/x86/diracdsp_mmx.h
+++ b/libavcodec/x86/diracdsp.h
@@ -23,7 +23,7 @@
 
 #include "libavcodec/diracdsp.h"
 
-void ff_diracdsp_init_mmx(DiracDSPContext* c);
+void ff_diracdsp_init_x86(DiracDSPContext* c);
 
 DECL_DIRAC_PIXOP(put, mmx);
 DECL_DIRAC_PIXOP(avg, mmx);
diff --git a/libavcodec/x86/diracdsp_mmx.c b/libavcodec/x86/diracdsp_init.c
similarity index 98%
rename from libavcodec/x86/diracdsp_mmx.c
rename to libavcodec/x86/diracdsp_init.c
index e0a0558..1e6bf11 100644
--- a/libavcodec/x86/diracdsp_mmx.c
+++ b/libavcodec/x86/diracdsp_init.c
@@ -19,7 +19,7 @@
  */
 
 #include "libavutil/x86/cpu.h"
-#include "diracdsp_mmx.h"
+#include "diracdsp.h"
 #include "fpel.h"
 
 void ff_put_rect_clamped_mmx(uint8_t *dst, int dst_stride, const int16_t *src, int src_stride, int width, int height);
@@ -119,7 +119,7 @@ void ff_avg_dirac_pixels32_sse2(uint8_t *dst, const uint8_t *src[5], int stride,
     }
 }
 
-void ff_diracdsp_init_mmx(DiracDSPContext* c)
+void ff_diracdsp_init_x86(DiracDSPContext* c)
 {
     int mm_flags = av_get_cpu_flags();
 
-- 
2.1.4