diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-10 12:44:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-10 12:44:39 +0100 |
| commit | 2ce64413e2b7f60041ff3e929e58242004c7921d (patch) | |
| tree | 3c79e169c5da7940c94eb61658a6e69e3f221795 /libavutil | |
| parent | b56ff0b261c4432e52e6b66bbd515f5694292b8a (diff) | |
| parent | 4b60fac4199680957b15b7a08c5df47e47c6e25e (diff) | |
| download | ffmpeg-2ce64413e2b7f60041ff3e929e58242004c7921d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: PALIGNR: port to cpuflags
x86: h264_qpel_10bit: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86util.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index 02edd70e4f..03cc47b4e2 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -280,7 +280,14 @@ %endif %endmacro -%macro PALIGNR_MMX 4-5 ; [dst,] src1, src2, imm, tmp +%macro PALIGNR 4-5 +%if cpuflag(ssse3) +%if %0==5 + palignr %1, %2, %3, %4 +%else + palignr %1, %2, %3 +%endif +%elif cpuflag(mmx) ; [dst,] src1, src2, imm, tmp %define %%dst %1 %if %0==5 %ifnidn %1, %2 @@ -299,13 +306,6 @@ psrldq %4, %3 %endif por %%dst, %4 -%endmacro - -%macro PALIGNR_SSSE3 4-5 -%if %0==5 - palignr %1, %2, %3, %4 -%else - palignr %1, %2, %3 %endif %endmacro |