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

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
 

diff --git a/extras/contrib/src/Patches/x264-svn-info-threads.patch b/extras/contrib/src/Patches/x264-svn-info-threads.patch
new file mode 100755 (executable)
index 0000000..14eb660
--- /dev/null
+++ b/extras/contrib/src/Patches/x264-svn-info-threads.patch
@@ -0,0 +1,12 @@
+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 )
+     {

diff --git a/extras/contrib/src/Patches/x264-svn-win32.patch b/extras/contrib/src/Patches/x264-svn-win32.patch
index 348ab9320cdfcb8e23f8b3d6a6fafba64a61249d..b578a798bef0746bafd65cc6456f86f939cc5877 100644 (file)
--- a/extras/contrib/src/Patches/x264-svn-win32.patch
+++ b/extras/contrib/src/Patches/x264-svn-win32.patch
@@ -94,16 +94,3 @@ Index: Makefile
        $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
        $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
  
-
-Index: encoder/encoder.c
-===================================================================
---- encoder/encoder.c  (revision 736)
-+++ 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 )
-     {