summaryrefslogtreecommitdiff
path: root/src/lib/video_content.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/video_content.cc')
-rw-r--r--src/lib/video_content.cc6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 8e07174e3..ca0c687a7 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -221,14 +221,16 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
{
/* These examiner calls could call other content methods which take a lock on the mutex */
dcp::Size const vs = d->video_size ();
- float const vfr = d->video_frame_rate ();
+ optional<float> const vfr = d->video_frame_rate ();
ContentTime vl = d->video_length ();
optional<float> const ar = d->sample_aspect_ratio ();
{
boost::mutex::scoped_lock lm (_mutex);
_video_size = vs;
- _video_frame_rate = vfr;
+ if (vfr) {
+ _video_frame_rate = vfr.get ();
+ }
_video_length = vl;
_sample_aspect_ratio = ar;