(contrib) Do not use --std=c99 for ffmpeg on contrib when crosscompiling to win32.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index b114476eb98259489fce75e8fe13c6036e96ed3c..c43931b0c2abbd5ba9f73541a50d8d7652cda16f 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1083,6 +1083,9 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-internal-define.patch
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
+ifdef HAVE_WIN32
+       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
+endif
 ifdef NO_TEXT_RELOCATION
        echo "Broken LD. Fix your tools."
        exit -1

diff --git a/extras/contrib/src/Patches/ffmpeg-svn-win32.patch b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
new file mode 100644 (file)
index 0000000..8d05681
--- /dev/null
+++ b/extras/contrib/src/Patches/ffmpeg-svn-win32.patch
@@ -0,0 +1,13 @@
+Index: configure
+===================================================================
+--- configure  (revision 15611)
++++ configure  (working copy)
+@@ -1149,7 +1149,7 @@
+ TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
+ 
+ check_cflags -fasm
+-check_cflags -std=c99
++# check_cflags -std=c99
+ 
+ case "$arch" in
+     i386|i486|i586|i686|i86pc|BePC)