--- configure.orig	2010-11-08 11:40:43.000000000 -0600
+++ configure	2011-03-25 17:14:43.000000000 -0500
@@ -693,3 +693,3 @@
     log_file $TMPC
-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -c -o $TMPO $TMPC
+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPC
 }
@@ -700,3 +700,3 @@
     log_file $TMPC
-    check_cmd $cc $CPPFLAGS $CFLAGS "$@" -E -o $TMPO $TMPC
+    check_cmd $cc $CPPFLAGS $CFLAGS -I${prefix}/include "$@" -E -o $TMPO $TMPC
 }
@@ -707,3 +707,3 @@
     log_file $TMPCXX
-    check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS "$@" -c -o $TMPO $TMPCXX
+    check_cmd $cxx $CXXPPFLAGS $ECXXFLAGS -I${prefix}/include "$@" -c -o $TMPO $TMPCXX
 }
@@ -1867,3 +1867,3 @@
 arch_default=$(uname -m)
-cpu="generic"
+cpu="i686"
 processor=`uname -p 2>/dev/null`
@@ -2828,3 +2828,3 @@
             enable cmov
-            enable fast_cmov
+            disable fast_cmov
         ;;
@@ -3028,3 +3028,2 @@
         CPPFLAGS=`echo $CPPFLAGS | sed 's/-D_POSIX_C_SOURCE=200112//'`
-        disable ivtv
         enable backend
@@ -4744,2 +4743,4 @@
 LATE_LIBS+=-L${sysroot}${libdir}
+CONFIG_INCLUDEPATH=
+FREETYPE_CFLAGS-= -I/usr/local/include
 EOF
@@ -4780,2 +4781,3 @@
 MANDIR=\$(INSTALL_ROOT)$mandir
+CFLAGS+=-I/usr/local/include
 endif # FFMPEG_CONFIG_MAK
