Various fixes pointed out by tests.

[dcpomatic.git] / src / lib / video_content.cc

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 1fe02bae4551134e02a57873e2c1eb5ebd1dc3ed..1da5d87c16778046c1720c972c783000ae4bd559 100644 (file)
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -228,9 +228,8 @@ VideoContent::take_from_video_examiner (shared_ptr<VideoExaminer> d)
        {
                boost::mutex::scoped_lock lm (_mutex);
                _video_size = vs;
-               if (vfr) {
-                       _video_frame_rate = vfr.get ();
-               }
+               /* Default video frame rate to 24fps if the examiner doesn't know */
+               _video_frame_rate = vfr.get_value_or (24);
                _video_length = vl;
                _sample_aspect_ratio = ar;