Merge CV, ver=5.1; ops/methods from HV, and interface from CV where possible

[goodguy/history.git] / cinelerra-5.0 / thirdparty / src / x265.patch1

diff --git a/cinelerra-5.0/thirdparty/src/x265.patch1 b/cinelerra-5.0/thirdparty/src/x265.patch1
deleted file mode 100644 (file)
index 538df80..0000000
--- a/cinelerra-5.0/thirdparty/src/x265.patch1
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ru a/source/encoder/encoder.cpp b/source/encoder/encoder.cpp
---- a/source/encoder/encoder.cpp       2016-01-24 22:16:50.000000000 -0700
-+++ b/source/encoder/encoder.cpp       2016-02-21 09:02:20.443636332 -0700
-@@ -361,7 +361,10 @@
-     }
- 
-     if (m_threadPool)
--        m_threadPool->stopWorkers();
-+    {
-+        for (int i = 0; i < m_numPools; i++)
-+            m_threadPool[i].stopWorkers();
-+    }
- }
- 
- void Encoder::destroy()