[SCM] libav/experimental: patch from Martin Decky <deckm1am at ss1000.ms.mff.cuni.cz> applied and unnecassery "memory" removed

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 17f715fa64d9663f65e3247d876ae258deb369a3
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Oct 29 18:00:45 2001 +0000

    patch from Martin Decky <deckm1am at ss1000.ms.mff.cuni.cz> applied and unnecassery "memory" removed
    
    Originally committed as revision 2535 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc

diff --git a/postproc/swscale.c b/postproc/swscale.c
index a4dd1a4..3bcbb84 100644
--- a/postproc/swscale.c
+++ b/postproc/swscale.c
@@ -1436,8 +1436,11 @@ else				s_xinc2= s_xinc;
 	g16Dither2= g16Dither;
 #endif
   }
-__asm __volatile(SFENCE:::"memory");
-__asm __volatile(EMMS:::"memory");
+
+#ifdef HAVE_MMX
+	__asm __volatile(SFENCE:::"memory");
+	__asm __volatile(EMMS);
+#endif
 }
 
 
diff --git a/postproc/swscale_template.c b/postproc/swscale_template.c
index a4dd1a4..3bcbb84 100644
--- a/postproc/swscale_template.c
+++ b/postproc/swscale_template.c
@@ -1436,8 +1436,11 @@ else				s_xinc2= s_xinc;
 	g16Dither2= g16Dither;
 #endif
   }
-__asm __volatile(SFENCE:::"memory");
-__asm __volatile(EMMS:::"memory");
+
+#ifdef HAVE_MMX
+	__asm __volatile(SFENCE:::"memory");
+	__asm __volatile(EMMS);
+#endif
 }
 
 

-- 
Libav/FFmpeg packaging