diff options
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 5 | ||||
| -rw-r--r-- | libavcodec/x86/Makefile | 15 | ||||
| -rw-r--r-- | libavcodec/x86/constants.c | 3 | ||||
| -rw-r--r-- | libavcodec/x86/dsputil_mmx.c | 3 |
4 files changed, 12 insertions, 14 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index fcb006a1db..f65e0e9e45 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -38,9 +38,8 @@ OBJS-$(CONFIG_AUDIO_FRAME_QUEUE) += audio_frame_queue.o OBJS-$(CONFIG_CRYSTALHD) += crystalhd.o OBJS-$(CONFIG_DCT) += dct.o dct32_fixed.o dct32_float.o OBJS-$(CONFIG_DXVA2) += dxva2.o -OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ - simple_idct.o \ - jrevdct.o +OBJS-$(CONFIG_DSPUTIL) += dsputil.o faanidct.o \ + simple_idct.o jrevdct.o OBJS-$(CONFIG_ENCODERS) += faandct.o jfdctfst.o jfdctint.o OBJS-$(CONFIG_ERROR_RESILIENCE) += error_resilience.o FFT-OBJS-$(CONFIG_HARDCODED_TABLES) += cos_tables.o cos_fixed_tables.o diff --git a/libavcodec/x86/Makefile b/libavcodec/x86/Makefile index e1573c0161..295e399214 100644 --- a/libavcodec/x86/Makefile +++ b/libavcodec/x86/Makefile @@ -1,5 +1,5 @@ -OBJS += x86/fmtconvert_init.o \ - x86/constants.o +OBJS += x86/constants.o \ + x86/fmtconvert_init.o \ OBJS-$(CONFIG_AAC_DECODER) += x86/sbrdsp_init.o OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp_init.o @@ -52,6 +52,10 @@ YASM-OBJS-$(CONFIG_AC3DSP) += x86/ac3dsp.o YASM-OBJS-$(CONFIG_DCT) += x86/dct32.o YASM-OBJS-$(CONFIG_DIRAC_DECODER) += x86/diracdsp_mmx.o x86/diracdsp_yasm.o\ x86/dwt_yasm.o +YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ + x86/fpelbase.o \ + x86/mpeg4qpel.o \ + x86/qpelbase.o YASM-OBJS-$(CONFIG_ENCODERS) += x86/dsputilenc.o YASM-OBJS-$(CONFIG_FFT) += x86/fft.o YASM-OBJS-$(CONFIG_H263_DECODER) += x86/h263_loopfilter.o @@ -88,10 +92,5 @@ YASM-OBJS-$(CONFIG_VP6_DECODER) += x86/vp56dsp.o YASM-OBJS-$(CONFIG_VP8_DECODER) += x86/vp8dsp.o YASM-OBJS-$(CONFIG_WEBP_DECODER) += x86/vp8dsp.o -YASM-OBJS-$(CONFIG_DSPUTIL) += x86/dsputil.o \ - x86/mpeg4qpel.o \ - x86/qpelbase.o \ - x86/fpelbase.o - YASM-OBJS += x86/deinterlace.o \ - x86/fmtconvert.o + x86/fmtconvert.o \ diff --git a/libavcodec/x86/constants.c b/libavcodec/x86/constants.c index 821d73f4ed..7c2ddc6067 100644 --- a/libavcodec/x86/constants.c +++ b/libavcodec/x86/constants.c @@ -21,6 +21,9 @@ #include "libavutil/mem.h" #include "libavutil/x86/asm.h" // for xmm_reg +DECLARE_ALIGNED(8, const uint64_t, ff_bone) = 0x0101010101010101ULL; +DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL; + DECLARE_ALIGNED(16, const xmm_reg, ff_pw_1) = { 0x0001000100010001ULL, 0x0001000100010001ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_2) = { 0x0002000200020002ULL, 0x0002000200020002ULL }; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_3) = { 0x0003000300030003ULL, 0x0003000300030003ULL }; diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index fe59d22017..58429c4e66 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -38,9 +38,6 @@ //#include <assert.h> /* pixel operations */ -DECLARE_ALIGNED(8, const uint64_t, ff_bone) = 0x0101010101010101ULL; -DECLARE_ALIGNED(8, const uint64_t, ff_wtwo) = 0x0002000200020002ULL; - DECLARE_ALIGNED(8, const uint64_t, ff_pw_15) = 0x000F000F000F000FULL; DECLARE_ALIGNED(16, const xmm_reg, ff_pw_17) = { 0x0011001100110011ULL, 0x0011001100110011ULL }; DECLARE_ALIGNED(8, const uint64_t, ff_pw_20) = 0x0014001400140014ULL; |