--- external/FFmpeg/configure.orig	2010-08-23 18:54:20.000000000 +0200
+++ external/FFmpeg/configure	2010-11-01 21:13:19.000000000 +0100
@@ -1528,8 +1528,8 @@
 nm_opts='-g'
 
 # machine
-arch_default=$(uname -m)
-cpu="generic"
+arch_default=$(uname -p)
+cpu="i686"
 
 # OS
 target_os_default=$(tolower $(uname -s))
@@ -2108,7 +2108,7 @@
         i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2|amdfam10|barcelona)
             cpuflags="-march=$cpu"
             enable cmov
-            enable fast_cmov
+            disable fast_cmov
         ;;
         # targets that do support conditional mov but on which it's slow
         pentium4|pentium4m|prescott|nocona)