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 /libavresample/x86/audio_convert.asm | |
| 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 'libavresample/x86/audio_convert.asm')
| -rw-r--r-- | libavresample/x86/audio_convert.asm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm index 567a916bc8..1d125c2b50 100644 --- a/libavresample/x86/audio_convert.asm +++ b/libavresample/x86/audio_convert.asm @@ -919,10 +919,8 @@ cglobal conv_s16_to_s16p_6ch, 2,7,5, dst, src, dst1, dst2, dst3, dst4, dst5 REP_RET %endmacro -%define PALIGNR PALIGNR_MMX INIT_XMM sse2 CONV_S16_TO_S16P_6CH -%define PALIGNR PALIGNR_SSSE3 INIT_XMM ssse3 CONV_S16_TO_S16P_6CH %if HAVE_AVX_EXTERNAL @@ -1038,10 +1036,8 @@ cglobal conv_s16_to_fltp_6ch, 2,7,7, dst, src, dst1, dst2, dst3, dst4, dst5 REP_RET %endmacro -%define PALIGNR PALIGNR_MMX INIT_XMM sse2 CONV_S16_TO_FLTP_6CH -%define PALIGNR PALIGNR_SSSE3 INIT_XMM ssse3 CONV_S16_TO_FLTP_6CH INIT_XMM sse4 @@ -1160,10 +1156,8 @@ cglobal conv_flt_to_s16p_6ch, 2,7,7, dst, src, dst1, dst2, dst3, dst4, dst5 REP_RET %endmacro -%define PALIGNR PALIGNR_MMX INIT_XMM sse2 CONV_FLT_TO_S16P_6CH -%define PALIGNR PALIGNR_SSSE3 INIT_XMM ssse3 CONV_FLT_TO_S16P_6CH %if HAVE_AVX_EXTERNAL |