diff options
Diffstat (limited to 'src/lib/video_content.cc')
| -rw-r--r-- | src/lib/video_content.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc index 8a4414c18..e697a281d 100644 --- a/src/lib/video_content.cc +++ b/src/lib/video_content.cc @@ -39,10 +39,14 @@ VideoContent::as_xml (xmlpp::Node* node) const void VideoContent::take_from_video_decoder (shared_ptr<VideoDecoder> d) { + /* These decoder calls could call other content methods which take a lock on the mutex */ + libdcp::Size const vs = d->native_size (); + float const vfr = d->frames_per_second (); + { boost::mutex::scoped_lock lm (_mutex); - _video_size = d->native_size (); - _video_frame_rate = d->frames_per_second (); + _video_size = vs; + _video_frame_rate = vfr; } Changed (VideoContentProperty::VIDEO_SIZE); |