diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-09 13:27:42 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-09 13:27:42 +0200 |
| commit | 77aedc77abbe21f2c28052544a0b2f227bca1c77 (patch) | |
| tree | 78e2b3d349105d6f73cd5f811e5374bca4bbcb94 /libavcodec/x86/proresdsp_init.c | |
| parent | 4819d43d7f0e220b231699e0ac7b0dc906b3147c (diff) | |
| parent | 75c37c5ace6271dc9dc996a61b799bcd2fc1b30d (diff) | |
| download | ffmpeg-77aedc77abbe21f2c28052544a0b2f227bca1c77.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: Provide the right alignment for external mmx asm
x86: Replace checks for CPU extensions and flags by convenience macros
configure: msvc: fix/simplify setting of flags for hostcc
x86: mlpdsp: mlp_filter_channel_x86 requires inline asm
Conflicts:
libavcodec/x86/fft_init.c
libavcodec/x86/h264_intrapred_init.c
libavcodec/x86/h264dsp_init.c
libavcodec/x86/mpegaudiodec.c
libavcodec/x86/proresdsp_init.c
libavutil/x86/float_dsp_init.c
libswscale/utils.c
libswscale/x86/swscale.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/proresdsp_init.c')
| -rw-r--r-- | libavcodec/x86/proresdsp_init.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/x86/proresdsp_init.c b/libavcodec/x86/proresdsp_init.c index 5892af2518..21ce0986d2 100644 --- a/libavcodec/x86/proresdsp_init.c +++ b/libavcodec/x86/proresdsp_init.c @@ -20,6 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/x86/cpu.h" #include "libavcodec/proresdsp.h" void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize, @@ -31,25 +32,25 @@ void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize, void ff_proresdsp_x86_init(ProresDSPContext *dsp, AVCodecContext *avctx) { -#if ARCH_X86_64 && HAVE_YASM +#if ARCH_X86_64 int flags = av_get_cpu_flags(); if(avctx->flags & CODEC_FLAG_BITEXACT) return; - if (flags & AV_CPU_FLAG_SSE2) { + if (EXTERNAL_SSE2(flags)) { dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; dsp->idct_put = ff_prores_idct_put_10_sse2; } - if (flags & AV_CPU_FLAG_SSE4) { + if (EXTERNAL_SSE4(flags)) { dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; dsp->idct_put = ff_prores_idct_put_10_sse4; } - if (HAVE_AVX_EXTERNAL && flags & AV_CPU_FLAG_AVX) { + if (EXTERNAL_AVX(flags)) { dsp->idct_permutation_type = FF_TRANSPOSE_IDCT_PERM; dsp->idct_put = ff_prores_idct_put_10_avx; } -#endif /* ARCH_X86_64 && HAVE_YASM */ +#endif /* ARCH_X86_64 */ } |