X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=3e825e4433383f455469ae2a52d3011fba47042a;hb=3e56ff52385513e78fbe3b03e9787a6606b762d9;hp=87ac5040fffa642ec259fee463235434ec134765;hpb=d81db4280dd09ea9d0064272b075667d659b594a;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index 87ac5040f..3e825e443 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -44,6 +44,7 @@ using std::list; using std::cout; using boost::shared_ptr; using boost::optional; +using namespace dcpomatic; static optional stored; static bool @@ -70,11 +71,10 @@ test (boost::filesystem::path file, vector frames) BOOST_REQUIRE (boost::filesystem::exists (path)); shared_ptr film = new_test_film ("ffmpeg_decoder_seek_test_" + file.string()); - shared_ptr content (new FFmpegContent (film, path)); + shared_ptr content (new FFmpegContent (path)); film->examine_and_add_content (content); - wait_for_jobs (); - shared_ptr log (new NullLog); - shared_ptr decoder (new FFmpegDecoder (content, log)); + BOOST_REQUIRE (!wait_for_jobs()); + shared_ptr decoder (new FFmpegDecoder (film, content, false)); decoder->video->Data.connect (bind (&store, _1)); for (vector::const_iterator i = frames.begin(); i != frames.end(); ++i) {