diff options
| author | Carl Hetherington <cth@carlh.net> | 2024-05-29 21:21:29 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2024-05-29 21:21:29 +0200 |
| commit | 5708ccdd531c72ff9e43106d354464adf6afa699 (patch) | |
| tree | 082abf672cb1a4b7a640e4bb3b519e91a03a6562 | |
| parent | 07aa4852acfd908c4e3a92f7bed2c7328cfcf123 (diff) | |
Fix merge.
| -rw-r--r-- | test/audio_content_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/audio_content_test.cc b/test/audio_content_test.cc index 465109259..cc9fad712 100644 --- a/test/audio_content_test.cc +++ b/test/audio_content_test.cc @@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE (audio_content_fades_same_as_video) BOOST_AUTO_TEST_CASE(fade_out_works_with_dcp_content) { auto dcp = std::make_shared<DCPContent>(TestPaths::private_data() / "JourneyToJah_TLR-1_F_EN-DE-FR_CH_51_2K_LOK_20140225_DGL_SMPTE_OV"); - auto film = new_test_film2("fade_out_works_with_dcp_content", { dcp }); + auto film = new_test_film("fade_out_works_with_dcp_content", { dcp }); dcp->audio->set_fade_out(dcpomatic::ContentTime::from_seconds(15)); make_and_verify_dcp(film); |