X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=f99229c65d27962c864e0db8a712f008ab4122b0;hb=bb285dedfb798ddaada80fdfdddf5873cb990289;hp=67a82541894923e5010ff44e78ec0b441ce14fb7;hpb=d474df7f2f8c01ece7ded039fe4c926555677dc4;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 67a825418..f99229c65 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -43,6 +43,7 @@ using std::list;
 using boost::shared_ptr;
 using boost::optional;
 using boost::bind;
+using namespace dcpomatic;
 
 static DCPTime next;
 static DCPTime frame;
@@ -61,9 +62,9 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	BOOST_REQUIRE (boost::filesystem::exists (path));
 
 	shared_ptr<Film> film = new_test_film ("ffmpeg_decoder_sequential_test_" + file.string());
-	shared_ptr<FFmpegContent> content (new FFmpegContent (film, path));
+	shared_ptr<FFmpegContent> content (new FFmpegContent(path));
 	film->examine_and_add_content (content);
-	wait_for_jobs ();
+	BOOST_REQUIRE (!wait_for_jobs());
 	film->write_metadata ();
 	shared_ptr<Log> log (new NullLog);
 	shared_ptr<Player> player (new Player (film, film->playlist()));
@@ -83,5 +84,5 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test)
 {
 	ffmpeg_decoder_sequential_test_one ("boon_telly.mkv", 29.97, 6912);
 	ffmpeg_decoder_sequential_test_one ("Sintel_Trailer1.480p.DivX_Plus_HD.mkv", 24, 1253);
-	ffmpeg_decoder_sequential_test_one ("prophet_clip.mkv", 23.976, 2879);
+	ffmpeg_decoder_sequential_test_one ("prophet_long_clip.mkv", 23.976, 2879);
 }