highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

x86: mpegvideo: more sensible names for optimization file and init function

Browse Source
This commit is contained in:
Diego Biurrun
2012-08-13 13:13:57 +02:00
parent d211547ddd
commit dc40285427
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mpegvideo.c
View File

@ -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_intra = dct_unquantize_mpeg2_intra_bitexact;
s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c;
#if HAVE_MMX #if ARCH_X86
ff_MPV_common_init_mmx(s); ff_MPV_common_init_x86(s);
#elif ARCH_ALPHA #elif ARCH_ALPHA
ff_MPV_common_init_axp(s); ff_MPV_common_init_axp(s);
#elif HAVE_MMI #elif HAVE_MMI

2
libavcodec/mpegvideo.h
View File

@ -757,7 +757,7 @@ int ff_MPV_encode_end(AVCodecContext *avctx);
int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt, int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
const AVFrame *frame, int *got_packet); const AVFrame *frame, int *got_packet);
void ff_MPV_encode_init_x86(MpegEncContext *s); 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_axp(MpegEncContext *s);
void ff_MPV_common_init_mmi(MpegEncContext *s); void ff_MPV_common_init_mmi(MpegEncContext *s);
void ff_MPV_common_init_arm(MpegEncContext *s); void ff_MPV_common_init_arm(MpegEncContext *s);

2
libavcodec/x86/Makefile
View File

@ -22,7 +22,7 @@ MMX-OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o
MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o MMX-OBJS-$(CONFIG_H264PRED) += x86/h264_intrapred_init.o
MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o MMX-OBJS-$(CONFIG_LPC) += x86/lpc_mmx.o
MMX-OBJS-$(CONFIG_MPEGAUDIODSP) += x86/mpegaudiodec_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_MPEGVIDEOENC) += x86/mpegvideoenc.o
MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o MMX-OBJS-$(CONFIG_PNG_DECODER) += x86/pngdsp_init.o
MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o MMX-OBJS-$(CONFIG_PRORES_DECODER) += x86/proresdsp_init.o

2
libavcodec/x86/mpegvideo_mmx.c → libavcodec/x86/mpegvideo.c
View File

@ -584,7 +584,7 @@ static void denoise_dct_sse2(MpegEncContext *s, DCTELEM *block){
#endif /* HAVE_INLINE_ASM */ #endif /* HAVE_INLINE_ASM */
void ff_MPV_common_init_mmx(MpegEncContext *s) void ff_MPV_common_init_x86(MpegEncContext *s)
{ {
#if HAVE_INLINE_ASM #if HAVE_INLINE_ASM
int mm_flags = av_get_cpu_flags(); int mm_flags = av_get_cpu_flags();