Commit 219a17b0 authored by trax's avatar trax

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

* 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..)
parent 632ef79d
......@@ -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
......
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 )
{
......@@ -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 )
{
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment