X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_seek_test.cc;h=c69c74c685c5422f38d33d8391b4a06ba64a4b9b;hb=4285355ff2bec853924647f0523d121860fe64e3;hp=c09fd02f37d6769e5401f90a8a48267976571805;hpb=4b2cf0764a4091b9466f90e6dbbeb029e04bc2be;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_seek_test.cc b/test/ffmpeg_decoder_seek_test.cc index c09fd02f3..c69c74c68 100644 --- a/test/ffmpeg_decoder_seek_test.cc +++ b/test/ffmpeg_decoder_seek_test.cc @@ -70,11 +70,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, false)); + 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) {