Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

[ffmpeg] / libavcodec / motion-test.c

diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c
index 6b954ebc9b8b9fc4e0e99aa8d7b6fe2a2fd488cd..3504ccfd68ed0a9ca29cc71bbed56331eb0cadc0 100644 (file)
--- a/libavcodec/motion-test.c
+++ b/libavcodec/motion-test.c
@@ -26,12 +26,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <sys/time.h>
-#include <unistd.h>
 
 #include "config.h"
 #include "dsputil.h"
+#include "libavutil/internal.h"
 #include "libavutil/lfg.h"
+#include "libavutil/mem.h"
 #include "libavutil/time.h"
 
 #undef printf
@@ -116,8 +116,8 @@ int main(int argc, char **argv)
     AVCodecContext *ctx;
     int c;
     DSPContext cctx, mmxctx;
-    int flags[2] = { AV_CPU_FLAG_MMX, AV_CPU_FLAG_MMX2 };
-    int flags_size = HAVE_MMX2 ? 2 : 1;
+    int flags[2] = { AV_CPU_FLAG_MMX, AV_CPU_FLAG_MMXEXT };
+    int flags_size = HAVE_MMXEXT ? 2 : 1;
 
     if (argc > 1) {
         help();