diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
| commit | 59e769023c392c332331567a1aea94660002c463 (patch) | |
| tree | e68d918e3c48f470a688b8bb5bf95590fb9c4916 /test/import_dcp_test.cc | |
| parent | 5af65f61bf6eba06c24025d63b43aec896a00c9c (diff) | |
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calculation.
Diffstat (limited to 'test/import_dcp_test.cc')
| -rw-r--r-- | test/import_dcp_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/import_dcp_test.cc b/test/import_dcp_test.cc index b2420b1fe..80cd9c3df 100644 --- a/test/import_dcp_test.cc +++ b/test/import_dcp_test.cc @@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) A->set_name ("frobozz"); shared_ptr<FFmpegContent> c (new FFmpegContent (A, "test/data/test.mp4")); - A->examine_and_add_content (c, true); + A->examine_and_add_content (c); A->set_encrypted (true); wait_for_jobs (); @@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE (import_dcp_test) shared_ptr<DCPContent> d (new DCPContent (B, "build/test/import_dcp_test/" + A->dcp_name())); d->add_kdm (kdm); - B->examine_and_add_content (d, true); + B->examine_and_add_content (d); wait_for_jobs (); B->make_dcp (); |