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/4k_test.cc | |
| parent | 8102046b2f29e0c7b234c29bf204b056cb30e64f (diff) | |
| parent | 66162217d93baa3fd50594bb013a44bbd779d02a (diff) | |
Merge master.
Diffstat (limited to 'test/4k_test.cc')
| -rw-r--r-- | test/4k_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/4k_test.cc b/test/4k_test.cc index 1e0b42697..fa5b33bb9 100644 --- a/test/4k_test.cc +++ b/test/4k_test.cc @@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (fourk_test) shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/test.mp4")); c->set_scale (VideoContentScale (Ratio::from_id ("185"))); film->set_resolution (RESOLUTION_4K); - film->set_dcp_content_type (DCPContentType::from_dci_name ("FTR")); + film->set_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")); film->set_container (Ratio::from_id ("185")); film->examine_and_add_content (c); wait_for_jobs (); |