[SCM] libav/experimental: Fix sigill on non-MMX2 CPUs.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit e4732ba98b2a20251c60cbc9d314f585866aca1b
Author: Diego Biurrun <diego at biurrun.de>
Date:   Fri Apr 10 11:29:51 2009 +0000

    Fix sigill on non-MMX2 CPUs.
    
    Originally committed as revision 18410 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/motion-test.c b/libavcodec/motion-test.c
index e24c7de..86baa22 100644
--- a/libavcodec/motion-test.c
+++ b/libavcodec/motion-test.c
@@ -29,6 +29,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
+#include "config.h"
 #include "dsputil.h"
 #include "libavutil/lfg.h"
 
@@ -128,6 +129,7 @@ int main(int argc, char **argv)
     int c;
     DSPContext cctx, mmxctx;
     int flags[2] = { FF_MM_MMX, FF_MM_MMX2 };
+    int flags_size = HAVE_MMX2 ? 2 : 1;
 
     for(;;) {
         c = getopt(argc, argv, "h");
@@ -145,7 +147,7 @@ int main(int argc, char **argv)
     ctx = avcodec_alloc_context();
     ctx->dsp_mask = FF_MM_FORCE;
     dsputil_init(&cctx, ctx);
-    for (c = 0; c < 1; c++) {
+    for (c = 0; c < flags_size; c++) {
         int x;
         ctx->dsp_mask = FF_MM_FORCE | flags[c];
         dsputil_init(&mmxctx, ctx);

-- 
Libav/FFmpeg packaging