]> git.sesse.net Git - vlc/commitdiff
Revert "Contrib: remove patch unneeded for Windows"
authorJean-Baptiste Kempf <jb@videolan.org>
Sat, 9 Jan 2010 15:56:43 +0000 (16:56 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 9 Jan 2010 16:08:07 +0000 (17:08 +0100)
This reverts commit 10b9d038ae2c80fb41e23520ef1284258594f17c.

Yeah, sorry guys, but it looks like the dxva2 code needs it :'(

extras/contrib/src/Makefile
extras/contrib/src/Patches/ffmpeg-svn-win32.patch [new file with mode: 0644]

index 40b915249397cbbe5108e61508d7e63ea58c74dd..d1efbb644fb0f4b5e606b10cf1d09834b31c14e2 100644 (file)
@@ -1038,6 +1038,7 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-libavformat.patch
 endif
 ifdef HAVE_WIN32
+       (cd $@; patch -p0 < ../Patches/ffmpeg-svn-win32.patch)
        (cd $@; patch -p0 < ../Patches/ffmpeg-dxva2.patch)
 endif
 ifdef NO_TEXT_RELOCATION
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..d06af7a
--- /dev/null
@@ -0,0 +1,11 @@
+--- configure.orig     2009-07-26 00:06:36.000000000 +0200
++++ configure  2009-07-26 00:08:21.000000000 +0200
+@@ -1674,7 +1674,7 @@
+ fi
+ add_cppflags -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=200112
+-check_cflags -std=c99
++#check_cflags -std=c99
+ check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64
+ #include <stdlib.h>
+ EOF