* part of patch was applied upstream. Adapt....

diff --git a/extras/contrib/src/Patches/ffmpeg.patch.cvs b/extras/contrib/src/Patches/ffmpeg.patch.cvs
index abbd909ae72b9943a23df04ef2a770723d4d495d..447fccd6ce954a28297d3163be4263177bbb806e 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg.patch.cvs
+++ b/extras/contrib/src/Patches/ffmpeg.patch.cvs
@@ -10,15 +10,9 @@ diff -ru ffmpeg.orig/configure ffmpeg/configure
  CFLAGS="$CFLAGS -fno-expensive-optimizations"
  ;;
  esac
-@@ -370,11 +370,11 @@
+@@ -374,11 +374,11 @@
    ;;
-   --make=*) make=`echo $opt | cut -d '=' -f 2`
-   ;;
--  --extra-cflags=*) CFLAGS="${opt#--extra-cflags=}"
-+  --extra-cflags=*) CFLAGS="$CFLAGS ${opt#--extra-cflags=}"
-   ;;
--  --extra-ldflags=*) LDFLAGS=${opt#--extra-ldflags=}
-+  --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
+   --extra-ldflags=*) LDFLAGS="$LDFLAGS ${opt#--extra-ldflags=}"
    ;;
 -  --extra-libs=*) extralibs=${opt#--extra-libs=}
 +  --extra-libs=*) extralibs="$extralibs ${opt#--extra-libs=}"