[FFmpeg-cvslog] swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled .

Diego Biurrun git at videolan.org
Thu Jun 16 04:53:59 CEST 2011


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Jun 15 00:56:31 2011 +0200| [a60466dbc3aededb0a1fab96d7fe2286f4c1a8f7] | committer: Diego Biurrun

swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a60466dbc3aededb0a1fab96d7fe2286f4c1a8f7
---

 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 97c50dd..282618c 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 50f475a..0eaea77 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) {



More information about the ffmpeg-cvslog mailing list