From dc402854271ef3d4eaaa3c53fa85237e996a06be Mon Sep 17 00:00:00 2001
From: Diego Biurrun <diego@biurrun.de>
Date: Mon, 13 Aug 2012 13:13:57 +0200
Subject: [PATCH] x86: mpegvideo: more sensible names for optimization file and
init function
---
libavcodec/mpegvideo.c | 4 ++--
libavcodec/mpegvideo.h | 2 +-
libavcodec/x86/Makefile | 2 +-
libavcodec/x86/{mpegvideo_mmx.c => mpegvideo.c} | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
rename libavcodec/x86/{mpegvideo_mmx.c => mpegvideo.c} (99%)
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c
index 8f3544fa1aa..13e2accfbdd 100644
--- a/libavcodec/mpegvideo.c
+++ b/libavcodec/mpegvideo.c
@@ -185,8 +185,8 @@ av_cold int ff_dct_common_init(MpegEncContext *s)
s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
-#if HAVE_MMX
- ff_MPV_common_init_mmx(s);
+#if ARCH_X86
+ ff_MPV_common_init_x86(s);
#elif ARCH_ALPHA
ff_MPV_common_init_axp(s);
#elif HAVE_MMI
diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index 850681b1e61..7ea7f829377 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -757,7 +757,7 @@ int ff_MPV_encode_end(AVCodecContext *avctx);
int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet);
void ff_MPV_encode_init_x86(MpegEncContext *s);
-void ff_MPV_common_init_mmx(MpegEncContext *s);
+void ff_MPV_common_init_x86(MpegEncContext *s);
void ff_MPV_common_init_axp(MpegEncContext *s);
void ff_MPV_common_init_mmi(MpegEncContext *s);
void ff_MPV_common_init_arm(MpegEncContext *s);
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile
index d843bc90741..4dffe6cd34c 100644
--- a/libavcodec/x86/Makefile
+++ b/libavcodec/x86/Makefile
@@ -22,7 +22,7 @@ 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_MPEGVIDEO) += x86/mpegvideo_mmx.o
+MMX-OBJS-$(CONFIG_MPEGVIDEO) += x86/mpegvideo.o
MMX-OBJS-$(CONFIG_MPEGVIDEOENC) += x86/mpegvideoenc.o
MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o
MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o
diff --git a/libavcodec/x86/mpegvideo_mmx.c b/libavcodec/x86/mpegvideo.c
similarity index 99%
rename from libavcodec/x86/mpegvideo_mmx.c
rename to libavcodec/x86/mpegvideo.c
index 720deb39b82..077031af988 100644
--- a/libavcodec/x86/mpegvideo_mmx.c
+++ b/libavcodec/x86/mpegvideo.c
@@ -584,7 +584,7 @@ static void denoise_dct_sse2(MpegEncContext *s, DCTELEM *block){
#endif /* HAVE_INLINE_ASM */
-void ff_MPV_common_init_mmx(MpegEncContext *s)
+void ff_MPV_common_init_x86(MpegEncContext *s)
{
#if HAVE_INLINE_ASM
int mm_flags = av_get_cpu_flags();
--
GitLab