Fix crash when exporting a 2D project containing 3D content (#1680).

[dcpomatic.git] / test / ffmpeg_decoder_sequential_test.cc

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 67a82541894923e5010ff44e78ec0b441ce14fb7..892bc9e4c0909978f4c47be157cda4867badadde 100644 (file)
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -61,9 +61,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 +83,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);
 }