diff -urN ffmpeg-svn-r13168.orig/configure ffmpeg-svn-r13168/configure
--- ffmpeg-svn-r13168.orig/configure	2008-05-15 23:38:49 +0300
+++ ffmpeg-svn-r13168/configure	2008-05-15 23:50:50 +0300
@@ -605,6 +605,13 @@
     return $err
 }
 
+require_pkg(){
+    pkg="$1"
+    pkg-config --exists "$pkg" || die "ERROR: $pkg.pc not found"
+    add_extralibs `pkg-config --libs "$pkg"`
+    add_cflags `pkg-config --cflags "$pkg"`
+}
+
 apply(){
     file=$1
     shift
@@ -750,6 +757,7 @@
     mkstemp
     pld
     ppc64
+    xvmc
     round
     roundf
     sdl
@@ -1022,6 +1030,10 @@
     ;;
     --enable-debug=*) debuglevel="$optval"
     ;;
+    --enable-xvmc) xvmc="yes"; pkg_requires="$pkg_requires xvmc"
+    ;;
+    --disable-xvmc) xvmc="no"
+    ;;
     --enable-*=*|--disable-*=*)
     eval `echo "$opt" | sed 's/=/-/;s/--/action=/;s/-/ thing=/;s/-/ name=/'`
     case "$thing" in
@@ -1080,11 +1092,11 @@
 TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
 
 case "$arch" in
-    i386|i486|i586|i686|i86pc|BePC)
+    i[3456]86|pentium|pentiumpro|pentium-mmx|pentium[234]|pentium-m|prescott|k6|k6-[23]|athlon|athlon-tbird|athlon-4|athlon-[mx]p|winchip-c6|winchip2|c3|c3-2|i86pc|BePC)
         arch="x86_32"
         enable fast_unaligned
     ;;
-    x86_64|amd64)
+    x86_64|amd64|athlon64|opteron|k8|athlon-fx|nocona)
         arch="x86_32"
         enable fast_unaligned
         check_cc <<EOF && enable fast_64bit && arch="x86_64"
@@ -1421,19 +1433,18 @@
             enable ppc64
         ;;
         # targets that do NOT support conditional mov (cmov)
-        i[345]86|pentium|pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3)
+	i[345]86|pentium|pentium-mmx|k6|k6-[23]|winchip-c6|winchip2|c3|c3-2)
             add_cflags "-march=$cpu"
             disable cmov
         ;;
         # targets that do support conditional mov (cmov)
-        i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|core2)
+	i686|pentiumpro|pentium[23]|pentium-m|athlon|athlon-tbird|athlon-4|athlon-[mx]p|athlon64|k8|opteron|athlon-fx|x86_64|x86-64|core2)
             add_cflags "-march=$cpu"
             enable cmov
             enable fast_cmov
         ;;
         # targets that do support conditional mov but on which it's slow
         pentium4|pentium4m|prescott|nocona)
-            add_cflags "-march=$cpu"
             enable cmov
             disable fast_cmov
         ;;
@@ -1639,6 +1650,8 @@
 # these are off by default, so fail if requested and not available
 enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 enabled liba52     && require  liba52 a52dec/a52.h a52_init -la52
+enabled liba52bin  && check_header a52dec/a52.h && enable liba52
+enabled xvmc       && require xvmc X11/extensions/XvMClib.h XvMCQueryExtension -lXvMCW
 enabled libamr_nb  && require  libamrnb amrnb/interf_dec.h Speech_Decode_Frame_init -lamrnb -lm
 enabled libamr_wb  && require  libamrwb amrwb/dec_if.h D_IF_init -lamrwb -lm
 enabled libdirac   && add_cflags "$(pkg-config --cflags dirac)" \
@@ -1646,6 +1659,7 @@
                    && require  libdirac libdirac_encoder/dirac_encoder.h dirac_encoder_init -ldirac_encoder
 enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
 enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
+enabled libfaadbin && check_header faad.h && enable libfaad
 enabled libgsm     && require  libgsm gsm.h gsm_create -lgsm
 enabled libmp3lame && require  LAME lame/lame.h lame_init -lmp3lame -lm
 enabled libnut     && require  libnut libnut.h nut_demuxer_init -lnut
@@ -1727,7 +1741,7 @@
     restore_flags
 fi
 
-texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html
+which texi2html >/dev/null 2>&1 && enable texi2html || disable texi2html
 
 check_type sys/socket.h socklen_t
 
@@ -1944,6 +1958,7 @@
 fi
 echo "Sun medialib support      ${mlib-no}"
 echo "AVISynth enabled          ${avisynth-no}"
+echo "XvMC enabled              ${xvmc-no}"
 echo "liba52 support            ${liba52-no}"
 echo "liba52 dlopened           ${liba52bin-no}"
 echo "libamr-nb support         ${libamr_nb-no}"