diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-06-12 22:27:11 +0100 |
| commit | 4e411ea97b4dab8a5fa282d1d4cf7971ef1e24ad (patch) | |
| tree | 06db8731e77dfeaf537f2814d73c7a599035b95c /test/scaling_test.cc | |
| parent | 8102046b2f29e0c7b234c29bf204b056cb30e64f (diff) | |
| parent | 66162217d93baa3fd50594bb013a44bbd779d02a (diff) | |
Merge master.
Diffstat (limited to 'test/scaling_test.cc')
| -rw-r--r-- | test/scaling_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/scaling_test.cc b/test/scaling_test.cc index 704c2c7da..441af6bf3 100644 --- a/test/scaling_test.cc +++ b/test/scaling_test.cc @@ -56,7 +56,7 @@ static void scaling_test_for (shared_ptr<Film> film, shared_ptr<VideoContent> co BOOST_AUTO_TEST_CASE (scaling_test) { shared_ptr<Film> film = new_test_film ("scaling_test"); - film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_name ("scaling_test"); shared_ptr<ImageContent> imc (new ImageContent (film, "test/data/simple_testcard_640x480.png")); |