projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1b7a95e
)
Remove check for _threads being null, as I think it should not happen.
author
Carl Hetherington
<cth@carlh.net>
Sun, 10 Sep 2023 21:46:19 +0000
(23:46 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 16 Dec 2023 01:07:38 +0000
(
02:07
+0100)
src/lib/j2k_encoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/j2k_encoder.cc
b/src/lib/j2k_encoder.cc
index 552135469131a0a38fe273b6ce571bde29591d4c..1f0c606d1c854095281d24800671f76bfdddd0a5 100644
(file)
--- a/
src/lib/j2k_encoder.cc
+++ b/
src/lib/j2k_encoder.cc
@@
-229,10
+229,7
@@
J2KEncoder::encode (shared_ptr<PlayerVideo> pv, DCPTime time)
size_t threads = 0;
{
boost::mutex::scoped_lock lm (_threads_mutex);
- if (_threads)
- threads = _threads->size();
- else
- threads = std::thread::hardware_concurrency();
+ threads = _threads->size();
}
boost::mutex::scoped_lock queue_lock (_queue_mutex);