diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 14:44:53 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-14 14:44:59 +0100 |
| commit | b148a39d55ee90255dad0e58d1c11181343ea30e (patch) | |
| tree | ecaa990ffd7039f9ece6f9633fe19766a8f5f942 | |
| parent | 7766c7b7a0097e257c9070c9ef4275f8ec9b46dc (diff) | |
| parent | 46bacb5cc6169ff5e8e982495c4925467c1d8bb7 (diff) | |
| download | ffmpeg-b148a39d55ee90255dad0e58d1c11181343ea30e.tar.gz | |
Merge commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7'
* commit '46bacb5cc6169ff5e8e982495c4925467c1d8bb7':
x86: Consistently use cpu flag detection macros in places that still miss it
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 9c6f7950a5..2ec4c5dc6c 100644 --- a/libavcodec/x86/mpegaudiodsp.c +++ b/libavcodec/x86/mpegaudiodsp.c @@ -252,7 +252,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 2f7e4f717a..d9294ce783 100644 --- a/libswscale/x86/swscale.c +++ b/libswscale/x86/swscale.c @@ -382,11 +382,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); if (cpu_flags & AV_CPU_FLAG_SSE3){ if(c->use_mmx_vfilter && !(c->flags & SWS_ACCURATE_RND)) diff --git a/libswscale/x86/yuv2rgb.c b/libswscale/x86/yuv2rgb.c index e4315eff28..a3370eec61 100644 --- a/libswscale/x86/yuv2rgb.c +++ b/libswscale/x86/yuv2rgb.c @@ -34,6 +34,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 @@ -74,7 +75,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c) int cpu_flags = av_get_cpu_flags(); #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; @@ -84,7 +85,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) { |