diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:30:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:32:29 +0200 |
| commit | 742c392885b907f4f1cf092d3e62f82b4551abf3 (patch) | |
| tree | d35b00e094492e6ec9408b5583657a408376bafa /libavcodec/x86/constants.c | |
| parent | 65120f628ca5facb8ae5e14d923ed31218bc9409 (diff) | |
| parent | b93b27edb0455287f49182fbf11b68e575f59225 (diff) | |
| download | ffmpeg-742c392885b907f4f1cf092d3e62f82b4551abf3.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
dsputil: Make dsputil selectable
Conflicts:
configure
libavcodec/Makefile
libavcodec/x86/Makefile
libavcodec/x86/constants.c
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/dsputil_mmx.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/constants.c')
| -rw-r--r-- | libavcodec/x86/constants.c | 3 |
1 files changed, 3 insertions, 0 deletions
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 }; |