summaryrefslogtreecommitdiff
path: root/libavcodec/x86/dsputil_mmx.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-04-11 12:30:39 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-04-11 12:32:29 +0200
commit742c392885b907f4f1cf092d3e62f82b4551abf3 (patch)
treed35b00e094492e6ec9408b5583657a408376bafa /libavcodec/x86/dsputil_mmx.c
parent65120f628ca5facb8ae5e14d923ed31218bc9409 (diff)
parentb93b27edb0455287f49182fbf11b68e575f59225 (diff)
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/dsputil_mmx.c')
-rw-r--r--libavcodec/x86/dsputil_mmx.c3
1 files changed, 0 insertions, 3 deletions
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;