diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:16:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-31 14:16:18 +0100 |
| commit | 28c0678eb764b8d10faf1a988d2f0e2dc79c96a5 (patch) | |
| tree | 5b1c2da26f0d95c5acd7d042dc1cf8666f22e316 /libavcodec/x86/dsputilenc.asm | |
| parent | 4b874fc4fc2739db7a907ce430ac862e625b7387 (diff) | |
| parent | be923ed659016350592acb9b3346f706f8170ac5 (diff) | |
| download | ffmpeg-28c0678eb764b8d10faf1a988d2f0e2dc79c96a5.tar.gz | |
Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'
* commit 'be923ed659016350592acb9b3346f706f8170ac5':
x86: fmtconvert: port to cpuflags
x86: MMX2 ---> MMXEXT in macro names
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputilenc.asm')
| -rw-r--r-- | libavcodec/x86/dsputilenc.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/x86/dsputilenc.asm b/libavcodec/x86/dsputilenc.asm index f1db9a6b55..43dfe36ead 100644 --- a/libavcodec/x86/dsputilenc.asm +++ b/libavcodec/x86/dsputilenc.asm @@ -112,7 +112,7 @@ SECTION .text movd %3, %1 %endmacro -%macro HSUM_MMX2 3 +%macro HSUM_MMXEXT 3 pshufw %2, %1, 0xE paddusw %1, %2 pshufw %2, %1, 0x1 @@ -263,12 +263,12 @@ INIT_MMX %define HSUM HSUM_MMX HADAMARD8_DIFF_MMX mmx -%define ABS1 ABS1_MMX2 -%define HSUM HSUM_MMX2 +%define ABS1 ABS1_MMXEXT +%define HSUM HSUM_MMXEXT HADAMARD8_DIFF_MMX mmx2 INIT_XMM -%define ABS2 ABS2_MMX2 +%define ABS2 ABS2_MMXEXT %if ARCH_X86_64 %define ABS_SUM_8x8 ABS_SUM_8x8_64 %else |