projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Fix FFmpeg subtitle stream serialisation.
[dcpomatic.git]
/
src
/
lib
/
magick_image_proxy.cc
diff --git
a/src/lib/magick_image_proxy.cc
b/src/lib/magick_image_proxy.cc
index e4417f3665e85d0e15163bd0ffccde7b1fa2f23b..d4d7e8aa6b8690a2c8945b5fae5111b3fc4c4b35 100644
(file)
--- a/
src/lib/magick_image_proxy.cc
+++ b/
src/lib/magick_image_proxy.cc
@@
-66,6
+66,8
@@
MagickImageProxy::MagickImageProxy (shared_ptr<cxml::Node>, shared_ptr<Socket> s
shared_ptr<Image>
MagickImageProxy::image (optional<dcp::NoteHandler>) const
{
+ boost::mutex::scoped_lock lm (_mutex);
+
if (_image) {
return _image;
}