Sync with upstream

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
index 1ad3d91abf78176dafea9490d02bf3025d44b2b8..f5ea3c32a64d223292bd9e2568fea0db7f090cd5 100644 (file)
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ b/extras/contrib/src/Patches/x264-svn-win32.patch
@@ -2,17 +2,6 @@ Index: configure
 ===================================================================
 --- configure  (revision 612)
 +++ configure  (working copy)
-@@ -55,8 +55,8 @@
- shared="no"
- 
- CC="${CC-gcc}"
--CFLAGS="-Wall -I. -D__X264__"
--LDFLAGS=""
-+CFLAGS="$CFLAGS -Wall -I. -D__X264__"
-+LDFLAGS="$LDFLAGS"
- HAVE_GETOPT_LONG=1
- 
- AS="nasm"
 @@ -64,8 +64,101 @@
  
  EXE=""