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 /libswscale/x86 | |
| 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 'libswscale/x86')
| -rw-r--r-- | libswscale/x86/output.asm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libswscale/x86/output.asm b/libswscale/x86/output.asm index ec253ba5eb..e4707bedf6 100644 --- a/libswscale/x86/output.asm +++ b/libswscale/x86/output.asm @@ -246,7 +246,6 @@ cglobal yuv2planeX_%1, %3, 8, %2, filter, fltsize, src, dst, w, dither, offset %endif ; %1 == 8/9/10/16 %endmacro -%define PALIGNR PALIGNR_MMX %if ARCH_X86_32 INIT_MMX mmx2 yuv2planeX_fn 8, 0, 7 @@ -259,7 +258,6 @@ yuv2planeX_fn 8, 10, 7 yuv2planeX_fn 9, 7, 5 yuv2planeX_fn 10, 7, 5 -%define PALIGNR PALIGNR_SSSE3 INIT_XMM sse4 yuv2planeX_fn 8, 10, 7 yuv2planeX_fn 9, 7, 5 @@ -346,7 +344,7 @@ cglobal yuv2plane1_%1, %3, %3, %2, src, dst, w, dither, offset %if mmsize == 16 punpcklqdq m3, m3 %endif ; mmsize == 16 - PALIGNR_MMX m3, m3, 3, m2 + PALIGNR m3, m3, 3, m2 .no_rot: %if mmsize == 8 mova m2, m3 |