Merge branch 'master' of git@git.videolan.org:vlc

diff --git a/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch b/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
index 25ae82a9a02f5e9c4fc0856bdb100f18aabf2eee..8e0c9b63f45f5409897b5610cbbc685369800df1 100644 (file)
--- a/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
+++ b/extras/contrib/src/Patches/ffmpeg-darwin-ppc-mdynamic.patch
@@ -1,12 +1,12 @@
 Index: configure
 ===================================================================
---- configure  (revision 18349)
+--- configure  (revision 19505)
 +++ configure  (working copy)
-@@ -1758,7 +1758,6 @@
-         add_cflags -pipe
-         check_cflags -force_cpusubtype_ALL
-         check_cflags -Wno-sign-compare
+@@ -1826,7 +1826,6 @@
+         FFSERVERLDFLAGS=-Wl,-bind_at_load
+         objformat="macho"
+         enabled x86_64 && objformat="macho64"
 -        enabled shared || check_cflags -mdynamic-no-pic
-     fi
- fi
- 
+         ;;
+     mingw32*)
+         target_os=mingw32