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 /test | |
| 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 'test')
| -rw-r--r-- | test/client_server_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/client_server_test.cc b/test/client_server_test.cc index 0154200ad..0cd728165 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -84,7 +84,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) shared_ptr<PlayerVideo> pvf ( new PlayerVideo ( - shared_ptr<ImageProxy> (new RawImageProxy (image, log)), + shared_ptr<ImageProxy> (new RawImageProxy (image)), DCPTime (), Crop (), optional<float> (), @@ -168,7 +168,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) shared_ptr<PlayerVideo> pvf ( new PlayerVideo ( - shared_ptr<ImageProxy> (new RawImageProxy (image, log)), + shared_ptr<ImageProxy> (new RawImageProxy (image)), DCPTime (), Crop (), optional<float> (), |