X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=767ea6727d35f6f7d512fc3822cce3088217857c;hb=6648949ce34a6fc2b3abe2f1c28848fe6e59dcbd;hp=601dd1c59db7b4137f121d4e0507561d1a8d3b9d;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;p=dcpomatic.git diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc index 601dd1c59..767ea6727 100644 --- a/test/ffmpeg_decoder_sequential_test.cc +++ b/test/ffmpeg_decoder_sequential_test.cc @@ -22,13 +22,14 @@ * (dropped frames being checked by assert() in VideoDecoder). Also that the decoder picks up frame rates correctly. */ -#include -#include #include "lib/ffmpeg_content.h" #include "lib/ffmpeg_decoder.h" -#include "lib/log.h" +#include "lib/null_log.h" #include "lib/film.h" #include "test.h" +#include +#include +#include using std::cout; using std::cerr; @@ -50,7 +51,7 @@ test (boost::filesystem::path file, float fps, int gaps) film->examine_and_add_content (content); wait_for_jobs (); shared_ptr log (new NullLog); - shared_ptr decoder (new FFmpegDecoder (content, log)); + shared_ptr decoder (new FFmpegDecoder (content, log, false)); BOOST_CHECK_CLOSE (decoder->video_content()->video_frame_rate(), fps, 0.01); @@ -78,4 +79,3 @@ BOOST_AUTO_TEST_CASE (ffmpeg_decoder_sequential_test) */ test ("prophet_clip.mkv", 23.976, 12); } -