X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=test%2Fseek_zero_test.cc;h=2a1a061360e328fefc6721aeb09f1c9d3b7fedbc;hb=2898a88b4554335439891d8198bed8c820c20396;hp=03968ae5cb1c54ea11284b8c2d3bcaa8217cd2b9;hpb=c190bba821e60611bfeb59a54b73541fb529522a;p=dcpomatic.git

diff --git a/test/seek_zero_test.cc b/test/seek_zero_test.cc
index 03968ae5c..2a1a06136 100644
--- a/test/seek_zero_test.cc
+++ b/test/seek_zero_test.cc
@@ -28,10 +28,12 @@
 #include "lib/ratio.h"
 #include "lib/dcp_content_type.h"
 #include "lib/ffmpeg_decoder.h"
+#include "lib/ffmpeg_audio_stream.h"
 #include "lib/content_video.h"
 #include "test.h"
 
 using std::cout;
+using std::list;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 using boost::optional;
@@ -43,10 +45,10 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	film->set_container (Ratio::from_id ("185"));
 	film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test"));
 	shared_ptr<FFmpegContent> content (new FFmpegContent (film, "test/data/count300bd48.m2ts"));
-	content->set_scale (VideoContentScale (Ratio::from_id ("185")));
 	film->examine_and_add_content (content);
 	wait_for_jobs ();
-
+	content->set_scale (VideoContentScale (Ratio::from_id ("185")));
+	
 	/* Work out the first video frame index that we will be given, taking into account
 	 * the difference between first video and first audio.
 	 */
@@ -58,7 +60,7 @@ BOOST_AUTO_TEST_CASE (seek_zero_test)
 	VideoFrame const first_frame = video_delay.round_up (content->video_frame_rate ()).frames (content->video_frame_rate ());
 
 	FFmpegDecoder decoder (content, film->log());
-	optional<ContentVideo> a = decoder.get_video (first_frame, true);
-	BOOST_CHECK (a);
-	BOOST_CHECK_EQUAL (a->frame, first_frame);
+	list<ContentVideo> a = decoder.get_video (first_frame, true);
+	BOOST_CHECK (a.size() == 1);
+	BOOST_CHECK_EQUAL (a.front().frame, first_frame);
 }