X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_dcp_test.cc;h=c332759c8f96c6dbab245fdc717d74370cef3c96;hb=HEAD;hp=0d56f4290fd1788db1e655773717e5274df96e71;hpb=41262015eb2bb1fc3da8585883420975de381a65;p=dcpomatic.git diff --git a/test/ffmpeg_dcp_test.cc b/test/ffmpeg_dcp_test.cc index 0d56f4290..c332759c8 100644 --- a/test/ffmpeg_dcp_test.cc +++ b/test/ffmpeg_dcp_test.cc @@ -27,19 +27,18 @@ */ -#include -#include -#include -#include "lib/film.h" +#include "lib/dcp_content_type.h" #include "lib/ffmpeg_content.h" +#include "lib/film.h" #include "lib/ratio.h" -#include "lib/dcp_content_type.h" #include "lib/video_content.h" #include "test.h" +#include +#include +#include using std::make_shared; -using std::shared_ptr; BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test) @@ -69,7 +68,7 @@ BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmp p /= film->dcp_name(); auto i = boost::filesystem::directory_iterator (p); - while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with (i->path().leaf().string(), "j2c")) { + while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with(i->path().filename().string(), "j2c")) { ++i; }