Allow single-frame image contents to adjust their video frame rates to that of the...

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

diff --git a/src/lib/playlist.cc b/src/lib/playlist.cc
index c9de9b88fdd02726ebd41aa0754b5f26501cb16e..c5cd4b02d0149c52fdd2000f9bd994343695e9a3 100644 (file)
--- a/src/lib/playlist.cc
+++ b/src/lib/playlist.cc
@@ -212,7 +212,7 @@ Playlist::best_dcp_frame_rate () const
 {
        list<int> const allowed_dcp_frame_rates = Config::instance()->allowed_dcp_frame_rates ();
 
-       /* Work out what rates we could manage, including those achieved by using skip / repeat. */
+       /* Work out what rates we could manage, including those achieved by using skip / repeat */
        list<FrameRateCandidate> candidates;
 
        /* Start with the ones without skip / repeat so they will get matched in preference to skipped/repeated ones */
@@ -235,7 +235,7 @@ Playlist::best_dcp_frame_rate () const
                float this_error = 0;
                BOOST_FOREACH (shared_ptr<Content> j, _content) {
                        shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (j);
-                       if (!vc) {
+                       if (!vc || !vc->has_own_video_frame_rate()) {
                                continue;
                        }