summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2001-10-29 18:00:45 +0000
committerMichael Niedermayer <michaelni@gmx.at>2001-10-29 18:00:45 +0000
commit17f715fa64d9663f65e3247d876ae258deb369a3 (patch)
treeaddaa12c1c975dfef3ce1599ca0bf54fca53a44d
parent2add307d0501dc2f13904ab182289617dad2b988 (diff)
patch from Martin Decky <deckm1am@ss1000.ms.mff.cuni.cz> applied and unnecassery "memory" removed
Originally committed as revision 2535 to svn://svn.mplayerhq.hu/mplayer/trunk/postproc
-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
}