* extras/contrib/src/Patches/x264-svn-win32.patch: revert [25113] and [25140] log...

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index fa8fe8187fb8c4a575f2d482ca0ff2fa8149bac9..8dea3a451116485b312c0ad4c3376bf4ddac558a 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1320,11 +1320,12 @@ x264-$(X264_VERSION).tar.gz:
 ifdef SVN
 x264: 
        $(SVN) co svn://svn.videolan.org/x264/trunk/ x264
+       patch -p0 < Patches/x264-svn-info-threads.patch
 ifdef HAVE_WIN32
        (cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
 ifdef HAVE_DARWIN_OS
-       (cd $@; patch -p 0 < ../Patches/x264-svn-darwin.patch )
+       (cd $@; patch -p0 < ../Patches/x264-svn-darwin.patch )
 endif
 else