Player should fill towards the next video frame.

diff --git a/src/lib/player.cc b/src/lib/player.cc
index 00abc7190a823cd8ef080beb0b350f4f89dd25ca..0c9bcf363ca32217ad4e61f5661cdf68a1bf3310 100644 (file)
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -541,6 +541,7 @@ Player::pass ()
           NOT to fill gaps within content (the latter is done in ::video())
        */
        DCPTime fill_towards = earliest ? earliest_content : _playlist->length();
+       fill_towards = fill_towards.ceil (_film->video_frame_rate ());
 
        /* Work out where to fill video from */
        optional<DCPTime> video_fill_from;
@@ -579,7 +580,7 @@ Player::pass ()
                }
                list<DCPTimePeriod> p = subtract(period, _no_video);
                if (!p.empty ()) {
-                       fill_audio (period);
+                       fill_audio (p.front());
                }
                filled = true;
        }