Mercurial > mplayer.hg

changeset 34311:cdee75826a31

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make emms/femms code simpler/more obvious.
author reimar
date Mon, 05 Dec 2011 18:22:56 +0000
parents 7ef4cfcb1791
children d2a41814c879
files libmpcodecs/dec_video.c
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpcodecs/dec_video.c	Mon Dec 05 18:09:21 2011 +0000
+++ b/libmpcodecs/dec_video.c	Mon Dec 05 18:22:56 2011 +0000
@@ -420,15 +420,13 @@
         }
     }
 
-#if HAVE_MMX
     // some codecs are broken, and doesn't restore MMX state :(
     // it happens usually with broken/damaged files.
-    if (gCpuCaps.has3DNow) {
+    if (HAVE_AMD3DNOW && gCpuCaps.has3DNow) {
         __asm__ volatile ("femms\n\t":::"memory");
-    } else if (gCpuCaps.hasMMX) {
+    } else if (HAVE_MMX && gCpuCaps.hasMMX) {
         __asm__ volatile ("emms\n\t":::"memory");
     }
-#endif
 
     t2 = GetTimer();
     t = t2 - t;