X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=test%2Fffmpeg_decoder_seek_test.cc;h=33b407a97414ad0bda53a9efa7c2b57d60ffdd56;hb=ce058471aa9995adac968cecc205f5a4319f449e;hp=b8bfe3532d144d6f54df28f3e705a7b8d9c57783;hpb=84012cdd64f451891febd36154b7226ea21a899b;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc
index b8bfe3532..33b407a97 100644
--- a/test/ffmpeg_decoder_seek_test.cc
+++ b/test/ffmpeg_decoder_seek_test.cc
@@ -20,7 +20,7 @@
 
 /** @file  test/ffmpeg_decoder_seek_test.cc
  *  @brief Check seek() with FFmpegDecoder.
- *  @ingroup specific
+ *  @ingroup selfcontained
  *
  *  This doesn't check that the contents of those frames are right, which
  *  it probably should.
@@ -44,6 +44,10 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+using namespace dcpomatic;
 
 static optional<ContentVideo> stored;
 static bool
@@ -66,13 +70,13 @@ check (shared_ptr<FFmpegDecoder> decoder, int frame)
 static void
 test (boost::filesystem::path file, vector<int> frames)
 {
-	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_seek_test_" + file.string());
 	shared_ptr<FFmpegContent> content (new FFmpegContent (path));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (film, content, false));
 	decoder->video->Data.connect (bind (&store, _1));