diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-11-07 22:33:52 +0000 |
| commit | 985a83ffbf251db481150221914ef74fbfe549b2 (patch) | |
| tree | 5de2be442f41d3117102011c4ef92e375b0f0e25 /src/lib/player.cc | |
| parent | 8e4f48a96af091e7d90387aa027d65ac285a8201 (diff) | |
| parent | 87da92b45a9a0cf4ce809ea580a78c4dd5d96021 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
Diffstat (limited to 'src/lib/player.cc')
| -rw-r--r-- | src/lib/player.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc index db99cd2ad..fabb5b211 100644 --- a/src/lib/player.cc +++ b/src/lib/player.cc @@ -128,7 +128,7 @@ Player::setup_pieces () shared_ptr<const DCPContent> dc = dynamic_pointer_cast<const DCPContent> (*i); if (dc) { - decoder.reset (new DCPDecoder (dc, _film->log ())); + decoder.reset (new DCPDecoder (dc)); frc = FrameRateChange (dc->video_frame_rate(), _film->video_frame_rate()); } @@ -298,7 +298,7 @@ Player::black_player_video_frame (DCPTime time) const { return shared_ptr<PlayerVideo> ( new PlayerVideo ( - shared_ptr<const ImageProxy> (new RawImageProxy (_black_image, _film->log ())), + shared_ptr<const ImageProxy> (new RawImageProxy (_black_image)), time, Crop (), optional<float> (), |