Changeset 219a17b028a80e4a192a543fdcffff23892c174b

Timestamp:

14/02/08 20:23:13 (10 months ago)

Author:

Dennis van Amerongen <trax@videolan.org>

git-committer:

Dennis van Amerongen <trax@videolan.org> 1203016993 +0000

git-parent:

[632ef79dbc8feb1e106aaddcab412cea65ddbea1]

git-author:

Dennis van Amerongen <trax@videolan.org> 1203016993 +0000

Message:

* extras/contrib/src/Patches/x264-svn-win32.patch: revert [25113] and [25140] log x264 thread count from win32.patch and put it in a generic patch for all platforms (threads=0 autodetect for x264 is reportedly failing on win32 and linux too and always reports threads=1, though x264 cli works fine so it needs more debugging..)

Files:

• extras/contrib/src/Makefile (modified) (1 diff)
• extras/contrib/src/Patches/x264-svn-info-threads.patch (added)
• extras/contrib/src/Patches/x264-svn-win32.patch (modified) (1 diff)

extras/contrib/src/Makefile

@@ -1321 +1321 @@
-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
- 
+
-endif
-else

extras/contrib/src/Patches/x264-svn-win32.patch

@@ -95 +95 @@
-    $(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 )
-     {