generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: Consistently use cpu flag detection macros in places that still miss it

Browse Source
This commit is contained in:
Diego Biurrun 2014-01-13 18:52:32 +01:00
parent 7151c5d04a
commit 46bacb5cc6
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/x86/mpegaudiodsp.c
View File

@ -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 */

4
libswscale/x86/swscale.c
View File

@ -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

5
libswscale/x86/yuv2rgb.c
View File

@ -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) {