diff options
| author | Diego Biurrun <diego@biurrun.de> | 2014-01-13 18:52:32 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2014-01-14 00:04:58 +0100 |
| commit | 46bacb5cc6169ff5e8e982495c4925467c1d8bb7 (patch) | |
| tree | 57b5d6c428fc251315c868953171bf0d2f901111 | |
| parent | 7151c5d04aed3b496c21f713dcb603e2cbdb9c49 (diff) | |
| download | ffmpeg-46bacb5cc6169ff5e8e982495c4925467c1d8bb7.tar.gz | |
x86: Consistently use cpu flag detection macros in places that still miss it
| -rw-r--r-- | libavcodec/x86/mpegaudiodsp.c | 2 | ||||
| -rw-r--r-- | libswscale/x86/swscale.c | 4 | ||||
| -rw-r--r-- | libswscale/x86/yuv2rgb.c | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/x86/mpegaudiodsp.c b/libavcodec/x86/mpegaudiodsp.c index 3f0943c06e..f45cb7e4a4 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -243,7 +243,7 @@ av_cold void ff_mpadsp_init_x86(MPADSPContext *s) } #if HAVE_SSE2_INLINE - if (cpu_flags & AV_CPU_FLAG_SSE2) { + if (INLINE_SSE2(cpu_flags)) { s->apply_window_float = apply_window_mp3; } #endif /* HAVE_SSE2_INLINE */ diff --git a/libswscale/x86/swscale.c b/libswscale/x86/swscale.c index b14d97da66..a2bce48339 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -307,11 +307,11 @@ av_cold void ff_sws_init_swscale_x86(SwsContext *c) int cpu_flags = av_get_cpu_flags(); #if HAVE_MMX_INLINE - if (cpu_flags & AV_CPU_FLAG_MMX) + if (INLINE_MMX(cpu_flags)) sws_init_swscale_mmx(c); #endif #if HAVE_MMXEXT_INLINE - if (cpu_flags & AV_CPU_FLAG_MMXEXT) + if (INLINE_MMXEXT(cpu_flags)) sws_init_swscale_mmxext(c); #endif diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index 6f4f7f5451..bacc87f6c7 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -35,6 +35,7 @@ #include "libswscale/swscale_internal.h" #include "libavutil/attributes.h" #include "libavutil/x86/asm.h" +#include "libavutil/x86/cpu.h" #include "libavutil/cpu.h" #if HAVE_INLINE_ASM @@ -79,7 +80,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) return NULL; #if HAVE_MMXEXT_INLINE - if (cpu_flags & AV_CPU_FLAG_MMXEXT) { + if (INLINE_MMXEXT(cpu_flags)) { switch (c->dstFormat) { case AV_PIX_FMT_RGB24: return yuv420_rgb24_mmxext; @@ -89,7 +90,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) } #endif - if (cpu_flags & AV_CPU_FLAG_MMX) { + if (INLINE_MMX(cpu_flags)) { switch (c->dstFormat) { case AV_PIX_FMT_RGB32: if (c->srcFormat == AV_PIX_FMT_YUVA420P) { |