summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-29 18:00:45 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2001-10-29 18:00:45 +0000
commitba649eff2db19b80239a0faf6a2d9048ead4456b (patch)
tree71b60f042761598a77876e8a506ac7b5ca6be47a
parent455415daf2f484de646e6c57922e8c69d20e02fb (diff)
downloadmpv-ba649eff2db19b80239a0faf6a2d9048ead4456b.tar.bz2
mpv-ba649eff2db19b80239a0faf6a2d9048ead4456b.tar.xz
patch from Martin Decky <deckm1am@ss1000.ms.mff.cuni.cz> applied and unnecassery "memory" removed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2535 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--postproc/swscale.c7
-rw-r--r--postproc/swscale_template.c7
2 files changed, 10 insertions, 4 deletions
diff --git a/postproc/swscale.c b/postproc/swscale.c
index a4dd1a4147..3bcbb8430f 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 a4dd1a4147..3bcbb8430f 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
}