X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=cf841bcabcbd8d6343ee3334f0845fea2543fac4;hp=892bc9e4c0909978f4c47be157cda4867badadde;hb=d0555983d175e76585b2409d982e09f444eab391;hpb=6cc7359c1af897f334dab5ba455707ce0c59af9d

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 892bc9e4c..cf841bcab 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -26,7 +26,6 @@
 
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
-#include "lib/null_log.h"
 #include "lib/content_video.h"
 #include "lib/video_decoder.h"
 #include "lib/film.h"
@@ -43,6 +42,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
+using namespace dcpomatic;
 
 static DCPTime next;
 static DCPTime frame;
@@ -57,7 +57,7 @@ check (shared_ptr<PlayerVideo>, DCPTime time)
 void
 ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int video_length)
 {
-	boost::filesystem::path path = private_data / file;
+	boost::filesystem::path path = TestPaths::private_data / file;
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
@@ -65,7 +65,6 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	film->examine_and_add_content (content);
 	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
-	shared_ptr<Log> log (new NullLog);
 	shared_ptr<Player> player (new Player (film, film->playlist()));
 
 	BOOST_REQUIRE (content->video_frame_rate());