From 310cfd249d955850c39757d80e07949ad4fef205 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Mon, 1 Feb 2016 09:18:16 -0700 Subject: [PATCH] x265 patch for threadpool shutdown fix submited as: bug 241: fix theadpool shutdown https://bitbucket.org/multicoreware/x265/issues?status=new&status=open updated download list --- cinelerra-5.0/thirdparty/downloads.txt | 2 ++ cinelerra-5.0/thirdparty/src/x265.patch1 | 14 ++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 cinelerra-5.0/thirdparty/src/x265.patch1 diff --git a/cinelerra-5.0/thirdparty/downloads.txt b/cinelerra-5.0/thirdparty/downloads.txt index 31dd8eef..b37d9f97 100644 --- a/cinelerra-5.0/thirdparty/downloads.txt +++ b/cinelerra-5.0/thirdparty/downloads.txt @@ -27,4 +27,6 @@ http://tcpdiag.dl.sourceforge.net/project/lame/lame/3.99/lame-3.99.5.tar.gz http://dl.maptools.org/dl/libtiff/tiff-3.8.2.tar.gz http://hivelocity.dl.sourceforge.net/project/libuuid/libuuid-1.0.3.tar.gz ftp://ftp.videolan.org/pub/x264/snapshots/last_stable_x264.tar.bz2 +https://get.videolan.org/x265/x265_1.7.tar.gz +http://ffmpeg.org/releases/ffmpeg-2.8.4.tar.bz2 https://chromium.googlesource.com/webm/libvpx/+archive/cbecf57f3e0d85a7b7f97f3ab7c507f6fe640a93.tar.gz diff --git a/cinelerra-5.0/thirdparty/src/x265.patch1 b/cinelerra-5.0/thirdparty/src/x265.patch1 new file mode 100644 index 00000000..dde859d8 --- /dev/null +++ b/cinelerra-5.0/thirdparty/src/x265.patch1 @@ -0,0 +1,14 @@ +--- a/source/encoder/encoder.cpp 2016-02-01 08:55:44.815838396 -0700 ++++ b/source/encoder/encoder.cpp 2016-02-01 08:56:25.355766065 -0700 +@@ -318,7 +318,10 @@ + } + + if (m_threadPool) +- m_threadPool->stopWorkers(); ++ { ++ for (int i = 0; i < m_numPools; i++) ++ m_threadPool[i].stopWorkers(); ++ } + } + + void Encoder::destroy() -- 2.26.2