diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-12 19:57:25 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2013-08-28 23:59:24 +0200 |
| commit | a64f6a04ac5773aeff2003897455dadb9609f18b (patch) | |
| tree | 04b2e4bdf33965b25779102a77e0cad63713ed1e /libavcodec/x86 | |
| parent | f61bece684d9685b07895508e6c1c733b5564ccf (diff) | |
| download | android_external_ffmpeg-a64f6a04ac5773aeff2003897455dadb9609f18b.tar.gz android_external_ffmpeg-a64f6a04ac5773aeff2003897455dadb9609f18b.tar.bz2 android_external_ffmpeg-a64f6a04ac5773aeff2003897455dadb9609f18b.zip | |
dsputil: x86: Hide arch-specific initialization details
Also give consistent names to init functions.
Diffstat (limited to 'libavcodec/x86')
| -rw-r--r-- | libavcodec/x86/Makefile | 11 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 2 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index 9a0c0971c6..06c1cd3004 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -6,6 +6,9 @@ OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o OBJS-$(CONFIG_CAVS_DECODER) += x86/cavsdsp.o OBJS-$(CONFIG_DCT) += x86/dct_init.o OBJS-$(CONFIG_DNXHD_ENCODER) += x86/dnxhdenc.o +OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o +OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ + x86/motion_est.o OBJS-$(CONFIG_FFT) += x86/fft_init.o OBJS-$(CONFIG_H264CHROMA) += x86/h264chroma_init.o OBJS-$(CONFIG_H264DSP) += x86/h264dsp_init.o @@ -31,17 +34,13 @@ OBJS-$(CONFIG_VP6_DECODER) += x86/vp6dsp_init.o OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp_init.o OBJS-$(CONFIG_XMM_CLOBBER_TEST) += x86/w64xmmtest.o -MMX-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_init.o \ - x86/dsputil_mmx.o \ +MMX-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil_mmx.o \ x86/fdct.o \ x86/fpel_mmx.o \ x86/idct_mmx_xvid.o \ x86/idct_sse2_xvid.o \ x86/rnd_mmx.o \ - x86/simple_idct.o \ - -MMX-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc_mmx.o \ - x86/motion_est.o + x86/simple_idct.o MMX-OBJS-$(CONFIG_HPELDSP) += x86/fpel_mmx.o \ x86/hpeldsp_mmx.o \ x86/rnd_mmx.o diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 3e425bbdd6..898c3639cf 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -686,7 +686,7 @@ static av_cold void dsputil_init_sse4(DSPContext *c, AVCodecContext *avctx, #endif /* HAVE_SSE4_EXTERNAL */ } -av_cold void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) +av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) { int cpu_flags = av_get_cpu_flags(); |