Merge.

[dcpomatic.git] / test / skip_frame_test.cc

diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc
index 4420475942bfe4819220100130477a31cc0b8416..61176a7c62a2dc34a0ffb02f1342a2b23b620619 100644 (file)
--- a/test/skip_frame_test.cc
+++ b/test/skip_frame_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
        film->set_container (Ratio::from_id ("185"));
        film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
        shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-       c->set_ratio (Ratio::from_id ("185"));
+       c->set_scale (VideoContentScale (Ratio::from_id ("185")));
        film->examine_and_add_content (c);
 
        wait_for_jobs ();
@@ -46,7 +46,6 @@ BOOST_AUTO_TEST_CASE (skip_frame_test)
        film->make_dcp ();
        wait_for_jobs ();
 
-       std::cout << film->dir (film->dcp_name ()) << "\n";
        check_dcp ("test/data/skip_frame_test", film->dir (film->dcp_name ()));
 }