projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Encoded data must be copied; disambiguate second lock in encoder_thread.
[dcpomatic.git]
/
src
/
lib
/
encoder.cc
diff --git
a/src/lib/encoder.cc
b/src/lib/encoder.cc
index 93a364fedbdb74ce92824b763aa69231c112b285..f6d0cc40eb7d79eacd438b0e8a9c33b8b7232dfa 100644
(file)
--- a/
src/lib/encoder.cc
+++ b/
src/lib/encoder.cc
@@
-536,7
+536,7
@@
Encoder::encoder_thread (ServerDescription* server)
}
if (encoded) {
- boost::mutex::scoped_lock lock (_writer_mutex);
+ boost::mutex::scoped_lock lock
2
(_writer_mutex);
_write_queue.push_back (make_pair (encoded, vf->frame ()));
_writer_condition.notify_all ();
} else {