diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-19 14:24:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-19 14:24:20 +0100 |
| commit | e6d81ce22e433e5413003e49b39587d739a04520 (patch) | |
| tree | 9f5cf3e72a7aa2bc13f80da8695fd6d8a6c161cb /libavutil | |
| parent | 4116151a4bf35cffd2b55b028e714bb2c383c86f (diff) | |
| parent | 89923fce7006d0a42859360068c486aeb7e9b582 (diff) | |
| download | ffmpeg-e6d81ce22e433e5413003e49b39587d739a04520.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
x86: h264_intrapred: Fix C function names in comments
x86: SPLATD: port to cpuflags
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/x86/x86util.asm | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/libavutil/x86/x86util.asm b/libavutil/x86/x86util.asm index dfc180e981..c11df90386 100644 --- a/libavutil/x86/x86util.asm +++ b/libavutil/x86/x86util.asm @@ -574,24 +574,14 @@ %endif %endmacro -%macro SPLATD 2-3 0 -%if mmsize == 16 - pshufd %1, %2, (%3)*0x55 -%else - pshufw %1, %2, (%3)*0x11 + ((%3)+1)*0x44 -%endif -%endmacro - -%macro SPLATD_MMX 1 +%macro SPLATD 1 +%if mmsize == 8 punpckldq %1, %1 -%endmacro - -%macro SPLATD_SSE 1 - shufps %1, %1, 0 -%endmacro - -%macro SPLATD_SSE2 1 +%elif cpuflag(sse2) pshufd %1, %1, 0 +%elif cpuflag(sse) + shufps %1, %1, 0 +%endif %endmacro %macro CLIPW 3 ;(dst, min, max) |