Index: Portfile
===================================================================
--- Portfile	(revision 57083)
+++ Portfile	(working copy)
@@ -4,8 +4,8 @@
 PortSystem 1.0
 
 name            ffmpeg-devel
-set svn_rev     19723
-set swscale_rev 29548
+set svn_rev     19787
+set swscale_rev 29652
 version         ${svn_rev}
 categories      multimedia
 maintainers     devans openmaintainer
@@ -46,7 +46,6 @@
                 port:schroedinger \
                 port:faac \
                 port:faad2 \
-                port:XviD \
                 port:x264 \
                 path:lib/pkgconfig/sdl.pc:libsdl \
                 port:bzip2 \
@@ -106,7 +105,6 @@
         --enable-libdirac --enable-libschroedinger \
         --enable-libfaac \
         --enable-libfaad \
-        --enable-libxvid \
         --enable-libx264 \
         --mandir=${prefix}/share/man \
         --enable-shared --enable-pthreads \
@@ -144,9 +142,6 @@
     if { ![variant_isset no_gpl] } {
         configure.args-delete --enable-swscale
     }
-    if { ![variant_isset no_mmx] } {
-        configure.args-append --disable-mmx --disable-mmx2 --disable-sse --disable-ssse3 --disable-amd3dnow --disable-amd3dnowext
-    }
 }
 
 variant no_mmx description {disable all x86 asm optimizations} {
@@ -182,6 +177,13 @@
     depends_lib-append      path:lib/libspeex.dylib:speex-devel
 }
 
+# build with xvid support. not usually needed since
+# ffmpeg ships with support for that format baked in
+variant xvid description {enable XviD integration. note ffmpeg already has mp4 support built in} {
+    configure.args-append    --enable-libxvid
+    depends_lib-append       port:XviD
+}
+
 pre-configure {
     if {[variant_isset speex]} {
         if {![file exists ${prefix}/lib/libspeexdsp.dylib]} {