summaryrefslogtreecommitdiff
path: root/libavcodec/dsputil.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2011-02-26 22:51:56 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-04-03 16:40:10 +0200
commit151193603402aa2dde105c342b658696ccb441b0 (patch)
treeb6aaea7bb8bd11464caa86d81bb763c64c23f959 /libavcodec/dsputil.h
parentfcd62e1265a2eeddd3af7565af419043264a748b (diff)
Correctly implement:
commit c0ec9918b066c6bfca8613ac75b589bd3e405971 Author: Måns Rullgård <mans@mansr.com> Date: Tue Aug 24 17:47:05 2010 +0000 Remove global mm_flags variable Originally committed as revision 24909 to svn://svn.ffmpeg.org/ffmpeg/trunk Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/dsputil.h')
-rw-r--r--libavcodec/dsputil.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h
index 4f1f650dc8..5c2a9fe098 100644
--- a/libavcodec/dsputil.h
+++ b/libavcodec/dsputil.h
@@ -637,7 +637,11 @@ static inline void emms(void)
__asm__ volatile ("emms;":::"memory");
}
-#define emms_c() emms()
+#define emms_c() \
+{\
+ if(av_get_cpu_flags() & AV_CPU_FLAG_MMX)\
+ emms();\
+}
#elif ARCH_ARM