summaryrefslogtreecommitdiff
path: root/test/ffmpeg_dcp_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-06-02 12:06:20 +0100
committerCarl Hetherington <cth@carlh.net>2014-06-02 12:06:20 +0100
commit3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0 (patch)
tree24e46f4f566bfb98aa48e9dab602ec1c8d0591d6 /test/ffmpeg_dcp_test.cc
parent24d54ea7fe1ba128cf8d3521d6738fc73a7c623e (diff)
parent8fb0f4eaa6d91ca9369f45dd7a57c29149edaaac (diff)
Merge master.
Diffstat (limited to 'test/ffmpeg_dcp_test.cc')
-rw-r--r--test/ffmpeg_dcp_test.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc
index 1c897bcd9..234bf2c79 100644
--- a/test/ffmpeg_dcp_test.cc
+++ b/test/ffmpeg_dcp_test.cc
@@ -51,16 +51,16 @@ BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
wait_for_jobs ();
}
-/** Test Film::have_dcp(). Requires the output from ffmpeg_dcp_test above */
+/** Briefly test Film::cpls(). Requires the output from ffmpeg_dcp_test above */
BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test)
{
boost::filesystem::path p = test_film_dir ("ffmpeg_dcp_test");
shared_ptr<Film> f (new Film (p.string ()));
f->read_metadata ();
- BOOST_CHECK (!f->dcps().empty());
+ BOOST_CHECK (!f->cpls().empty());
p /= f->dcp_name();
p /= f->video_mxf_filename();
boost::filesystem::remove (p);
- BOOST_CHECK (f->dcps().empty());
+ BOOST_CHECK (f->cpls().empty());
}