X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2F4k_test.cc;h=e09aeeb5c4882912f7c0c8feb813537e02ba8542;hp=d8d3d66ec0e763c4a391564e9dbf0b88506895ad;hb=dd9be86db6cde0afa5da0d1d1ac43b42e05dca26;hpb=15a83d720780d58f905d40f8493cdcb86596eaee diff --git a/test/4k_test.cc b/test/4k_test.cc index d8d3d66ec..e09aeeb5c 100644 --- a/test/4k_test.cc +++ b/test/4k_test.cc @@ -18,7 +18,7 @@ */ -/** @defgroup completedcp Complete builds of DCPs with various characteristics, testing broad areas of code */ +/** @defgroup completedcp Complete builds of DCPs */ /** @file test/4k_test.cc * @brief Run a 4K encode from a simple input. @@ -36,12 +36,12 @@ #include "lib/dcpomatic_log.h" #include "test.h" -using boost::shared_ptr; +using std::shared_ptr; BOOST_AUTO_TEST_CASE (fourk_test) { shared_ptr film = new_test_film ("4k_test"); - dcpomatic_log = film->log (); + LogSwitcher ls (film->log()); film->set_name ("4k_test"); shared_ptr c (new FFmpegContent("test/data/test.mp4")); film->set_resolution (RESOLUTION_4K);