diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-08-13 13:13:57 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-08-24 02:23:16 +0200 |
| commit | dc402854271ef3d4eaaa3c53fa85237e996a06be (patch) | |
| tree | 50236694f2d83b47bd2b90e11e8474021b7800a2 | |
| parent | d211547dddf9deeb34b7dda9cd80b86f3f5cd07a (diff) | |
| download | ffmpeg-dc402854271ef3d4eaaa3c53fa85237e996a06be.tar.gz | |
x86: mpegvideo: more sensible names for optimization file and init function
| -rw-r--r-- | libavcodec/mpegvideo.c | 4 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/x86/mpegvideo.c (renamed from libavcodec/x86/mpegvideo_mmx.c) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 8f3544fa1a..13e2accfbd 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 850681b1e6..7ea7f82937 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 d843bc9074..4dffe6cd34 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 index 720deb39b8..077031af98 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(); |