Merge commit '9087eaf193b8ce99c41352064a81916fa66adb49'

[ffmpeg] / libavcodec / x86 / hpeldsp_init.c

diff --git a/libavcodec/x86/hpeldsp_init.c b/libavcodec/x86/hpeldsp_init.c
index 4b877b8e32836092956820bc8fbc4b9eaf2ef07d..73b6bb1311088c95095c5f392e8b050f02046e68 100644 (file)
--- a/libavcodec/x86/hpeldsp_init.c
+++ b/libavcodec/x86/hpeldsp_init.c
@@ -401,7 +401,7 @@ void ff_hpeldsp_init_x86(HpelDSPContext *c, int flags)
 {
     int mm_flags = av_get_cpu_flags();
 
-    if (mm_flags & AV_CPU_FLAG_MMX)
+    if (HAVE_MMX && mm_flags & AV_CPU_FLAG_MMX)
         hpeldsp_init_mmx(c, flags, mm_flags);
 
     if (mm_flags & AV_CPU_FLAG_MMXEXT)