X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fffmpeg_decoder_sequential_test.cc;h=e1e29ab17ab02d9c462d68923038b1d93ac55273;hb=504c63b3d62038bc486ca8a09e77fbb403907edd;hp=ac3064aa04b9e9610af8ce3bfddc60dac832d015;hpb=9423e02c37daba7f9e406929a1cfc1bb10fb4b62;p=dcpomatic.git

diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index ac3064aa0..e1e29ab17 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -25,6 +25,8 @@
 #include "lib/ffmpeg_content.h"
 #include "lib/ffmpeg_decoder.h"
 #include "lib/null_log.h"
+#include "lib/content_video.h"
+#include "lib/video_decoder.h"
 #include "lib/film.h"
 #include "test.h"
 #include <boost/filesystem.hpp>
@@ -53,20 +55,20 @@ ffmpeg_decoder_sequential_test_one (boost::filesystem::path file, float fps, int
 	shared_ptr<Log> log (new NullLog);
 	shared_ptr<FFmpegDecoder> decoder (new FFmpegDecoder (content, log, false));
 
-	BOOST_REQUIRE (decoder->_video_content->video_frame_rate());
-	BOOST_CHECK_CLOSE (decoder->_video_content->video_frame_rate().get(), fps, 0.01);
+	BOOST_REQUIRE (decoder->video->_video_content->video_frame_rate());
+	BOOST_CHECK_CLOSE (decoder->video->_video_content->video_frame_rate().get(), fps, 0.01);
 
 #ifdef DCPOMATIC_DEBUG
-	decoder->test_gaps = 0;
+	decoder->video->test_gaps = 0;
 #endif
 	for (Frame i = 0; i < video_length; ++i) {
 		list<ContentVideo> v;
-		v = decoder->get_video (i, true);
+		v = decoder->video->get_video (i, true);
 		BOOST_REQUIRE_EQUAL (v.size(), 1U);
 		BOOST_CHECK_EQUAL (v.front().frame, i);
 	}
 #ifdef DCPOMATIC_DEBUG
-	BOOST_CHECK_EQUAL (decoder->test_gaps, gaps);
+	BOOST_CHECK_EQUAL (decoder->video->test_gaps, gaps);
 #endif
 }