From a60466dbc3aededb0a1fab96d7fe2286f4c1a8f7 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Wed, 15 Jun 2011 00:56:31 +0200 Subject: [PATCH] swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. --- libswscale/x86/rgb2rgb.c | 2 +- libswscale/x86/yuv2rgb_mmx.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libswscale/x86/rgb2rgb.c b/libswscale/x86/rgb2rgb.c index 97c50dd636..282618c301 100644 --- a/libswscale/x86/rgb2rgb.c +++ b/libswscale/x86/rgb2rgb.c @@ -127,7 +127,7 @@ void rgb2rgb_init_x86(void) { int cpu_flags = av_get_cpu_flags(); - if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) + if (cpu_flags & AV_CPU_FLAG_MMX) rgb2rgb_init_MMX(); if (HAVE_AMD3DNOW && cpu_flags & AV_CPU_FLAG_3DNOW) rgb2rgb_init_3DNOW(); diff --git a/libswscale/x86/yuv2rgb_mmx.c b/libswscale/x86/yuv2rgb_mmx.c index 50f475a1ba..0eaea77485 100644 --- a/libswscale/x86/yuv2rgb_mmx.c +++ b/libswscale/x86/yuv2rgb_mmx.c @@ -81,7 +81,7 @@ SwsFunc ff_yuv2rgb_init_mmx(SwsContext *c) } #endif - if (HAVE_MMX && cpu_flags & AV_CPU_FLAG_MMX) { + if (cpu_flags & AV_CPU_FLAG_MMX) { switch (c->dstFormat) { case PIX_FMT_RGB32: if (c->srcFormat == PIX_FMT_YUVA420P) {