Index: Portfile
===================================================================
--- Portfile	(revision 57111)
+++ Portfile	(working copy)
@@ -6,7 +6,7 @@
 name            ffmpeg
 epoch           1
 version         0.5
-revision        3
+revision        4
 categories      multimedia
 maintainers     devans openmaintainer
 
@@ -50,7 +50,8 @@
 
 patchfiles      patch-libavfilter-avfilter.h.diff \
                 patch-libswscale-Makefile.diff \
-                patch-libswscale-swscale.h.diff
+                patch-libswscale-swscale.h.diff \
+                patch-ffmpeg-configure.diff
 
 
 use_parallel_build yes
@@ -134,14 +135,14 @@
     depends_lib-delete path:lib/pkgconfig/sdl.pc:libsdl
     depends_lib-append path:lib/pkgconfig/sdl.pc:libsdl-devel
     # ticket #20938
-    if { ![variant_isset no_sl_20938] } {
-        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
-        }
-    }
+#    if { ![variant_isset no_sl_20938] } {
+#        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} {