Updated nl_NL translation from Rob van Nieuwkerk.

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

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index 6ad32f511e1971ddd8d24123e4bdf0ba2bcfe696..376491738ef7b004fb2dd5d8dd37ef0c5bf9a96b 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -24,6 +24,7 @@
 #include "exceptions.h"
 #include "config.h"
 #include "cross.h"
+#include "compose.hpp"
 #include <dcp/openjpeg_image.h>
 #include <dcp/exceptions.h>
 #include <Magick++.h>
@@ -68,7 +69,7 @@ ImageExaminer::ImageExaminer (shared_ptr<const Film> film, shared_ptr<const Imag
        }
 
        if (content->still ()) {
-               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (24);
+               _video_length = Config::instance()->default_still_length() * video_frame_rate().get_value_or (film->video_frame_rate ());
        } else {
                _video_length = _image_content->number_of_paths ();
        }
@@ -83,6 +84,11 @@ ImageExaminer::video_size () const
 optional<double>
 ImageExaminer::video_frame_rate () const
 {
+       if (_image_content->has_own_video_frame_rate()) {
+               /* The content already knows what frame rate it should be */
+               return _image_content->video_frame_rate();
+       }
+
        /* Don't know */
        return optional<double> ();
 }