From bcc45d6348174241e1ec7ce9f8129bebbde4bde6 Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Wed, 8 Aug 2012 02:12:17 +0200
Subject: [PATCH] x86: avcodec: Drop silly "_mmx" suffixes from filenames

---
 libavcodec/x86/Makefile                          | 16 ++++++++--------
 libavcodec/x86/{cavsdsp_mmx.c => cavsdsp.c}      |  0
 libavcodec/x86/dsputil_mmx.c                     |  2 +-
 libavcodec/x86/{fdct_mmx.c => fdct.c}            |  0
 libavcodec/x86/{fft_mmx.asm => fft.asm}          |  0
 libavcodec/x86/{h264_qpel_mmx.c => h264_qpel.c}  |  0
 libavcodec/x86/{lpc_mmx.c => lpc.c}              |  0
 .../x86/{motion_est_mmx.c => motion_est.c}       |  0
 .../x86/{mpegaudiodec_mmx.c => mpegaudiodec.c}   |  0
 .../x86/{simple_idct_mmx.c => simple_idct.c}     |  0
 libavcodec/x86/{snowdsp_mmx.c => snowdsp.c}      |  0
 11 files changed, 9 insertions(+), 9 deletions(-)
 rename libavcodec/x86/{cavsdsp_mmx.c => cavsdsp.c} (100%)
 rename libavcodec/x86/{fdct_mmx.c => fdct.c} (100%)
 rename libavcodec/x86/{fft_mmx.asm => fft.asm} (100%)
 rename libavcodec/x86/{h264_qpel_mmx.c => h264_qpel.c} (100%)
 rename libavcodec/x86/{lpc_mmx.c => lpc.c} (100%)
 rename libavcodec/x86/{motion_est_mmx.c => motion_est.c} (100%)
 rename libavcodec/x86/{mpegaudiodec_mmx.c => mpegaudiodec.c} (100%)
 rename libavcodec/x86/{simple_idct_mmx.c => simple_idct.c} (100%)
 rename libavcodec/x86/{snowdsp_mmx.c => snowdsp.c} (100%)

diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index 8582e9ceae..43e1a3afb4 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -4,24 +4,24 @@ OBJS-$(CONFIG_VP3DSP)                  += x86/vp3dsp_init.o
 OBJS-$(CONFIG_XMM_CLOBBER_TEST)        += x86/w64xmmtest.o
 
 MMX-OBJS                               += x86/dsputil_mmx.o             \
-                                          x86/fdct_mmx.o                \
+                                          x86/fdct.o                    \
                                           x86/fmtconvert_init.o         \
                                           x86/idct_mmx_xvid.o           \
                                           x86/idct_sse2_xvid.o          \
-                                          x86/motion_est_mmx.o          \
-                                          x86/simple_idct_mmx.o         \
+                                          x86/motion_est.o              \
+                                          x86/simple_idct.o             \
 
 MMX-OBJS-$(CONFIG_AAC_DECODER)         += x86/sbrdsp_init.o
 MMX-OBJS-$(CONFIG_AC3DSP)              += x86/ac3dsp_init.o
-MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp_mmx.o
+MMX-OBJS-$(CONFIG_CAVS_DECODER)        += x86/cavsdsp.o
 MMX-OBJS-$(CONFIG_DNXHD_ENCODER)       += x86/dnxhdenc.o
-MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp_mmx.o
+MMX-OBJS-$(CONFIG_DWT)                 += x86/snowdsp.o
 MMX-OBJS-$(CONFIG_ENCODERS)            += x86/dsputilenc_mmx.o
 MMX-OBJS-$(CONFIG_FFT)                 += x86/fft_init.o
 MMX-OBJS-$(CONFIG_H264DSP)             += x86/h264dsp_init.o
 MMX-OBJS-$(CONFIG_H264PRED)            += x86/h264_intrapred_init.o
-MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc_mmx.o
-MMX-OBJS-$(CONFIG_MPEGAUDIODSP)        += x86/mpegaudiodec_mmx.o
+MMX-OBJS-$(CONFIG_LPC)                 += x86/lpc.o
+MMX-OBJS-$(CONFIG_MPEGAUDIODSP)        += x86/mpegaudiodec.o
 MMX-OBJS-$(CONFIG_MPEGVIDEO)           += x86/mpegvideo.o
 MMX-OBJS-$(CONFIG_MPEGVIDEOENC)        += x86/mpegvideoenc.o
 MMX-OBJS-$(CONFIG_PNG_DECODER)         += x86/pngdsp_init.o
@@ -38,7 +38,7 @@ YASM-OBJS-$(CONFIG_AAC_DECODER)        += x86/sbrdsp.o
 YASM-OBJS-$(CONFIG_AC3DSP)             += x86/ac3dsp.o
 YASM-OBJS-$(CONFIG_DCT)                += x86/dct32.o
 YASM-OBJS-$(CONFIG_ENCODERS)           += x86/dsputilenc.o
-YASM-OBJS-$(CONFIG_FFT)                += x86/fft_mmx.o
+YASM-OBJS-$(CONFIG_FFT)                += x86/fft.o
 YASM-OBJS-$(CONFIG_H264CHROMA)         += x86/h264_chromamc.o           \
                                           x86/h264_chromamc_10bit.o
 YASM-OBJS-$(CONFIG_H264DSP)            += x86/h264_deblock.o            \
diff --git a/libavcodec/x86/cavsdsp_mmx.c b/libavcodec/x86/cavsdsp.c
similarity index 100%
rename from libavcodec/x86/cavsdsp_mmx.c
rename to libavcodec/x86/cavsdsp.c
diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c
index 93f9db8299..c1f54ac64f 100644
--- a/libavcodec/x86/dsputil_mmx.c
+++ b/libavcodec/x86/dsputil_mmx.c
@@ -2081,7 +2081,7 @@ PREFETCH(prefetch_3dnow, prefetch)
 
 #endif /* HAVE_INLINE_ASM */
 
-#include "h264_qpel_mmx.c"
+#include "h264_qpel.c"
 
 void ff_put_h264_chroma_mc8_mmx_rnd  (uint8_t *dst, uint8_t *src,
                                       int stride, int h, int x, int y);
diff --git a/libavcodec/x86/fdct_mmx.c b/libavcodec/x86/fdct.c
similarity index 100%
rename from libavcodec/x86/fdct_mmx.c
rename to libavcodec/x86/fdct.c
diff --git a/libavcodec/x86/fft_mmx.asm b/libavcodec/x86/fft.asm
similarity index 100%
rename from libavcodec/x86/fft_mmx.asm
rename to libavcodec/x86/fft.asm
diff --git a/libavcodec/x86/h264_qpel_mmx.c b/libavcodec/x86/h264_qpel.c
similarity index 100%
rename from libavcodec/x86/h264_qpel_mmx.c
rename to libavcodec/x86/h264_qpel.c
diff --git a/libavcodec/x86/lpc_mmx.c b/libavcodec/x86/lpc.c
similarity index 100%
rename from libavcodec/x86/lpc_mmx.c
rename to libavcodec/x86/lpc.c
diff --git a/libavcodec/x86/motion_est_mmx.c b/libavcodec/x86/motion_est.c
similarity index 100%
rename from libavcodec/x86/motion_est_mmx.c
rename to libavcodec/x86/motion_est.c
diff --git a/libavcodec/x86/mpegaudiodec_mmx.c b/libavcodec/x86/mpegaudiodec.c
similarity index 100%
rename from libavcodec/x86/mpegaudiodec_mmx.c
rename to libavcodec/x86/mpegaudiodec.c
diff --git a/libavcodec/x86/simple_idct_mmx.c b/libavcodec/x86/simple_idct.c
similarity index 100%
rename from libavcodec/x86/simple_idct_mmx.c
rename to libavcodec/x86/simple_idct.c
diff --git a/libavcodec/x86/snowdsp_mmx.c b/libavcodec/x86/snowdsp.c
similarity index 100%
rename from libavcodec/x86/snowdsp_mmx.c
rename to libavcodec/x86/snowdsp.c