]> git.sesse.net Git - vlc/commitdiff
contribs: removed outdated x264 patch
authorFelix Paul Kühne <fkuehne@videolan.org>
Tue, 16 Feb 2010 18:10:21 +0000 (19:10 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Tue, 16 Feb 2010 18:10:21 +0000 (19:10 +0100)
extras/contrib/src/Makefile
extras/contrib/src/Patches/x264-svn-info-threads.patch [deleted file]

index 84cc972458dd7892bfa40248567378b54202ea57..40606067c0c2590a6ca789841fb82b0bd51e4872 100644 (file)
@@ -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 (file)
index 14eb660..0000000
+++ /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 )
-     {