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/pngdsp_init.c | |
| parent | 4819d43d7f0e220b231699e0ac7b0dc906b3147c (diff) | |
| parent | 75c37c5ace6271dc9dc996a61b799bcd2fc1b30d (diff) | |
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/pngdsp_init.c')
| -rw-r--r-- | libavcodec/x86/pngdsp_init.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/libavcodec/x86/pngdsp_init.c b/libavcodec/x86/pngdsp_init.c index 7a12730620..05fd051210 100644 --- a/libavcodec/x86/pngdsp_init.c +++ b/libavcodec/x86/pngdsp_init.c @@ -20,7 +20,7 @@ */ #include "libavutil/common.h" -#include "libavutil/cpu.h" +#include "libavutil/x86/cpu.h" #include "libavcodec/pngdsp.h" void ff_add_png_paeth_prediction_mmx2 (uint8_t *dst, uint8_t *src, @@ -34,18 +34,16 @@ void ff_add_bytes_l2_sse2(uint8_t *dst, uint8_t *src1, void ff_pngdsp_init_x86(PNGDSPContext *dsp) { -#if HAVE_YASM int flags = av_get_cpu_flags(); #if ARCH_X86_32 - if (flags & AV_CPU_FLAG_MMX) + if (EXTERNAL_MMX(flags)) dsp->add_bytes_l2 = ff_add_bytes_l2_mmx; #endif - if (flags & AV_CPU_FLAG_MMXEXT) + if (EXTERNAL_MMXEXT(flags)) dsp->add_paeth_prediction = ff_add_png_paeth_prediction_mmx2; - if (flags & AV_CPU_FLAG_SSE2) + if (EXTERNAL_SSE2(flags)) dsp->add_bytes_l2 = ff_add_bytes_l2_sse2; - if (flags & AV_CPU_FLAG_SSSE3) + if (EXTERNAL_SSSE3(flags)) dsp->add_paeth_prediction = ff_add_png_paeth_prediction_ssse3; -#endif } |