Slightly hacky fix to make ImageSequenceDialog actually work.

diff --git a/ChangeLog b/ChangeLog
index 37ac15d07bf1e3cd5bb672dfe9ccade31bd14931..778b2067f487745c74d5bbb5f2f24d668e6f5c97 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-20  Carl Hetherington  <cth@carlh.net>
+
+       * Fix setting of frame rate when loading
+       image folders.
+
 2015-09-18  Carl Hetherington  <cth@carlh.net>
 
        * Add another upmixer which is a simpler

diff --git a/src/lib/image_examiner.cc b/src/lib/image_examiner.cc
index bb0f365d62c1423e159a7baf3a5e23f6be393ab0..7a93b5cd1439a9bfa0757d6946e965ffa32c5788 100644 (file)
--- a/src/lib/image_examiner.cc
+++ b/src/lib/image_examiner.cc
@@ -84,6 +84,11 @@ ImageExaminer::video_size () const
 optional<double>
 ImageExaminer::video_frame_rate () const
 {
+       if (_image_content->video_frame_rate() != 0) {
+               /* The content already knows what frame rate it should be */
+               return _image_content->video_frame_rate();
+       }
+
        /* Don't know */
        return optional<double> ();
 }