X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=f81ebda9cfdfc9bc5991691bd5312259177d8be2;hb=c4709c21648a09a3f2caddefb571e3881af7e7f9;hp=d761d946556291db329d92d297cee36edc80b206;hpb=990f879d9af6300068af44c431b1a8e158e7f7a0;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index d761d9465..f81ebda9c 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -21,7 +21,7 @@ /** @file test/ffmpeg_decoder_sequential_test.cc * @brief Check that the FFmpeg decoder and Player produce sequential frames without gaps or dropped frames; * Also that the decoder picks up frame rates correctly. - * @ingroup specific + * @ingroup feature */ #include "lib/ffmpeg_content.h" @@ -39,9 +39,12 @@ using std::cout; using std::cerr; using std::list; -using boost::shared_ptr; +using std::shared_ptr; using boost::optional; using boost::bind; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif using namespace dcpomatic; static DCPTime next; @@ -57,7 +60,7 @@ check (shared_ptr, DCPTime time) void ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length) { - boost::filesystem::path path = TestPaths::private_data / file; + boost::filesystem::path path = TestPaths::private_data() / file; BOOST_REQUIRE (boost::filesystem::exists (path)); shared_ptr film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());