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/vorbisdsp_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/vorbisdsp_init.c')
| -rw-r--r-- | libavcodec/x86/vorbisdsp_init.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/x86/vorbisdsp_init.c b/libavcodec/x86/vorbisdsp_init.c index cd3971b796..284a528a0c 100644 --- a/libavcodec/x86/vorbisdsp_init.c +++ b/libavcodec/x86/vorbisdsp_init.c @@ -21,6 +21,7 @@ #include "config.h" #include "libavutil/attributes.h" #include "libavutil/cpu.h" +#include "libavutil/x86/cpu.h" #include "libavcodec/vorbisdsp.h" void ff_vorbis_inverse_coupling_3dnow(float *mag, float *ang, @@ -34,10 +35,10 @@ av_cold void ff_vorbisdsp_init_x86(VorbisDSPContext *dsp) int cpu_flags = av_get_cpu_flags(); #if ARCH_X86_32 - if (cpu_flags & AV_CPU_FLAG_3DNOW) + if (EXTERNAL_AMD3DNOW(cpu_flags)) dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_3dnow; #endif /* ARCH_X86_32 */ - if (cpu_flags & AV_CPU_FLAG_SSE) + if (EXTERNAL_SSE(cpu_flags)) dsp->vorbis_inverse_coupling = ff_vorbis_inverse_coupling_sse; #endif /* HAVE_YASM */ } |