From: Felix Paul Kühne <fkuehne@videolan.org>
Date: Tue, 16 Feb 2010 18:10:21 +0000 (+0100)
Subject: contribs: removed outdated x264 patch
X-Git-Tag: 1.1.0-pre1~887
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=ec0ee66b27e185a9a7288998f2f8e959fc671491;p=vlc

contribs: removed outdated x264 patch
---

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 84cc972458..40606067c0 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1347,7 +1347,6 @@ x264-$(X264_VERSION).tar.gz:
 ifdef GIT
 x264:
 	$(GIT) clone git://git.videolan.org/x264.git
-	patch -p0 < Patches/x264-svn-info-threads.patch
 ifdef HAVE_WIN32
 	(cd x264; patch -p0 < ../Patches/x264-svn-win32.patch )
 endif
diff --git a/extras/contrib/src/Patches/x264-svn-info-threads.patch b/extras/contrib/src/Patches/x264-svn-info-threads.patch
deleted file mode 100644
index 14eb6602d0..0000000000
--- a/extras/contrib/src/Patches/x264-svn-info-threads.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: x264/encoder/encoder.c
-===================================================================
---- x264/encoder/encoder.c	(revision 736)
-+++ x264/encoder/encoder.c	(working copy)
-@@ -360,6 +360,7 @@
-             h->param.b_pre_scenecut = 1;
- #endif
-     }
-+    x264_log( h, X264_LOG_INFO, "using threads=%d\n", h->param.i_threads );
- 
-     if( h->param.b_interlaced )
-     {