diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:08:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-30 12:08:28 +0200 |
| commit | 8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa (patch) | |
| tree | d7d3e4e39bab16e8a41ccd308e7cbf658206e5c8 /libavcodec/x86/dsputil_init.c | |
| parent | f0a35623826e367fb1534c68222bfd4918e58a0f (diff) | |
| parent | 6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0 (diff) | |
| download | ffmpeg-8be0e2bd43d99833c22dd6ce2958b699f9d5a3aa.tar.gz | |
Merge commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0'
* commit '6369ba3c9cc74becfaad2a8882dff3dd3e7ae3c0':
x86: avcodec: Use convenience macros to check for CPU flags
Conflicts:
libavcodec/x86/dsputil_init.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/motion_est.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/x86/dsputil_init.c')
| -rw-r--r-- | libavcodec/x86/dsputil_init.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/libavcodec/x86/dsputil_init.c b/libavcodec/x86/dsputil_init.c index 86e2fd3661..1baeeeec0f 100644 --- a/libavcodec/x86/dsputil_init.c +++ b/libavcodec/x86/dsputil_init.c @@ -23,6 +23,7 @@ #include "libavutil/attributes.h" #include "libavutil/cpu.h" #include "libavutil/x86/asm.h" +#include "libavutil/x86/cpu.h" #include "libavcodec/dsputil.h" #include "libavcodec/simple_idct.h" #include "dsputil_x86.h" @@ -681,7 +682,7 @@ av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) c->add_hfyu_median_prediction = ff_add_hfyu_median_prediction_cmov; #endif - if (cpu_flags & AV_CPU_FLAG_MMX) { + if (X86_MMX(cpu_flags)) { #if HAVE_INLINE_ASM const int idct_algo = avctx->idct_algo; @@ -713,19 +714,19 @@ av_cold void ff_dsputil_init_x86(DSPContext *c, AVCodecContext *avctx) dsputil_init_mmx(c, avctx, cpu_flags); } - if (cpu_flags & AV_CPU_FLAG_MMXEXT) + if (X86_MMXEXT(cpu_flags)) dsputil_init_mmxext(c, avctx, cpu_flags); - if (cpu_flags & AV_CPU_FLAG_SSE) + if (X86_SSE(cpu_flags)) dsputil_init_sse(c, avctx, cpu_flags); - if (cpu_flags & AV_CPU_FLAG_SSE2) + if (X86_SSE2(cpu_flags)) dsputil_init_sse2(c, avctx, cpu_flags); - if (cpu_flags & AV_CPU_FLAG_SSSE3) + if (EXTERNAL_SSSE3(cpu_flags)) dsputil_init_ssse3(c, avctx, cpu_flags); - if (cpu_flags & AV_CPU_FLAG_SSE4) + if (EXTERNAL_SSE4(cpu_flags)) dsputil_init_sse4(c, avctx, cpu_flags); if (CONFIG_ENCODERS) |