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 /libavutil | |
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 'libavutil')
-rw-r--r-- | libavutil/x86/x86util.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 2eefeff3c9..74abcbecab 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -157,7 +157,7 @@ psubw %1, %2 %endmacro -%macro PABSW_MMX2 2 +%macro PABSW_MMXEXT 2 pxor %1, %1 psubw %1, %2 pmaxsw %1, %2 @@ -189,13 +189,13 @@ psubw %2, %4 %endmacro -%macro ABS1_MMX2 2 ; a, tmp +%macro ABS1_MMXEXT 2 ; a, tmp pxor %2, %2 psubw %2, %1 pmaxsw %1, %2 %endmacro -%macro ABS2_MMX2 4 ; a, b, tmp0, tmp1 +%macro ABS2_MMXEXT 4 ; a, b, tmp0, tmp1 pxor %3, %3 pxor %4, %4 psubw %3, %1 |