diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:18:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-31 13:34:32 +0200 |
| commit | c617bed34f39a122ab1f89581ddce9cc63885383 (patch) | |
| tree | ed2c0bd467f5f5c912ac46a2b95457a5647ced75 /libavresample/x86/audio_convert.asm | |
| parent | 98298eb1034bddb4557fa689553dae793c2b0092 (diff) | |
| parent | ede3d6400d7c06863e6eb4bcff5f676480ae6b5e (diff) | |
| download | ffmpeg-c617bed34f39a122ab1f89581ddce9cc63885383.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
MSS1 and MSS2: set final pixel format after common stuff has been initialised
MSS2 decoder
configure: handle --disable-asm before check_deps
x86: Split inline and external assembly #ifdefs
configure: x86: Separate inline from standalone assembler capabilities
pktdumper: Use a custom define instead of PATH_MAX for buffers
pktdumper: Use av_strlcpy instead of strncpy
pktdumper: Use sizeof(variable) instead of the direct buffer length
Conflicts:
Changelog
configure
libavcodec/allcodecs.c
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/dct-test.c
libavcodec/imgconvert.c
libavcodec/mss12.c
libavcodec/version.h
libavfilter/x86/gradfun.c
libswscale/x86/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/x86/audio_convert.asm')
| -rw-r--r-- | libavresample/x86/audio_convert.asm | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/libavresample/x86/audio_convert.asm b/libavresample/x86/audio_convert.asm index 3db64d2f9b..2ebdbc1ec0 100644 --- a/libavresample/x86/audio_convert.asm +++ b/libavresample/x86/audio_convert.asm @@ -155,7 +155,7 @@ cglobal conv_s32_to_flt, 3,3,3, dst, src, len INIT_XMM sse2 CONV_S32_TO_FLT -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_YMM avx CONV_S32_TO_FLT %endif @@ -223,7 +223,7 @@ cglobal conv_flt_to_s32, 3,3,5, dst, src, len INIT_XMM sse2 CONV_FLT_TO_S32 -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_YMM avx CONV_FLT_TO_S32 %endif @@ -260,7 +260,7 @@ cglobal conv_s16p_to_s16_2ch, 3,4,5, dst, src0, len, src1 INIT_XMM sse2 CONV_S16P_TO_S16_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16P_TO_S16_2CH %endif @@ -383,7 +383,7 @@ INIT_XMM sse2 CONV_S16P_TO_S16_6CH INIT_XMM sse2slow CONV_S16P_TO_S16_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16P_TO_S16_6CH %endif @@ -432,7 +432,7 @@ cglobal conv_s16p_to_flt_2ch, 3,4,6, dst, src0, len, src1 INIT_XMM sse2 CONV_S16P_TO_FLT_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16P_TO_FLT_2CH %endif @@ -536,7 +536,7 @@ INIT_XMM sse2 CONV_S16P_TO_FLT_6CH INIT_XMM ssse3 CONV_S16P_TO_FLT_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16P_TO_FLT_6CH %endif @@ -692,7 +692,7 @@ INIT_MMX sse CONV_FLTP_TO_S16_6CH INIT_XMM sse2 CONV_FLTP_TO_S16_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLTP_TO_S16_6CH %endif @@ -729,7 +729,7 @@ cglobal conv_fltp_to_flt_2ch, 3,4,5, dst, src0, len, src1 INIT_XMM sse CONV_FLTP_TO_FLT_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLTP_TO_FLT_2CH %endif @@ -810,7 +810,7 @@ INIT_MMX mmx CONV_FLTP_TO_FLT_6CH INIT_XMM sse4 CONV_FLTP_TO_FLT_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLTP_TO_FLT_6CH %endif @@ -859,7 +859,7 @@ INIT_XMM sse2 CONV_S16_TO_S16P_2CH INIT_XMM ssse3 CONV_S16_TO_S16P_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16_TO_S16P_2CH %endif @@ -920,7 +920,7 @@ CONV_S16_TO_S16P_6CH %define PALIGNR PALIGNR_SSSE3 INIT_XMM ssse3 CONV_S16_TO_S16P_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16_TO_S16P_6CH %endif @@ -958,7 +958,7 @@ cglobal conv_s16_to_fltp_2ch, 3,4,5, dst0, src, len, dst1 INIT_XMM sse2 CONV_S16_TO_FLTP_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16_TO_FLTP_2CH %endif @@ -1041,7 +1041,7 @@ INIT_XMM ssse3 CONV_S16_TO_FLTP_6CH INIT_XMM sse4 CONV_S16_TO_FLTP_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_S16_TO_FLTP_6CH %endif @@ -1087,7 +1087,7 @@ cglobal conv_flt_to_s16p_2ch, 3,4,6, dst0, src, len, dst1 INIT_XMM sse2 CONV_FLT_TO_S16P_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLT_TO_S16P_2CH %endif @@ -1161,7 +1161,7 @@ CONV_FLT_TO_S16P_6CH %define PALIGNR PALIGNR_SSSE3 INIT_XMM ssse3 CONV_FLT_TO_S16P_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLT_TO_S16P_6CH %endif @@ -1193,7 +1193,7 @@ cglobal conv_flt_to_fltp_2ch, 3,4,3, dst0, src, len, dst1 INIT_XMM sse CONV_FLT_TO_FLTP_2CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLT_TO_FLTP_2CH %endif @@ -1256,7 +1256,7 @@ cglobal conv_flt_to_fltp_6ch, 2,7,7, dst, src, dst1, dst2, dst3, dst4, dst5 INIT_XMM sse2 CONV_FLT_TO_FLTP_6CH -%if HAVE_AVX +%if HAVE_AVX_EXTERNAL INIT_XMM avx CONV_FLT_TO_FLTP_6CH %endif |