summaryrefslogtreecommitdiff
path: root/test/ffmpeg_decoder_sequential_test.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-05-01 14:32:45 +0100
committerCarl Hetherington <cth@carlh.net>2014-05-01 14:32:45 +0100
commitc98c87afe29d9ef74bdced8a9c96d7752f3fe80f (patch)
tree9fad96b3e680ae368ef7488af80488edd4436394 /test/ffmpeg_decoder_sequential_test.cc
parentbbbfb3208e74a4de2f9b4540a17ec43d4e3541a3 (diff)
Fix 3D support.
Diffstat (limited to 'test/ffmpeg_decoder_sequential_test.cc')
-rw-r--r--test/ffmpeg_decoder_sequential_test.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/ffmpeg_decoder_sequential_test.cc b/test/ffmpeg_decoder_sequential_test.cc
index 48b9b6b3b..b4ff36e6e 100644
--- a/test/ffmpeg_decoder_sequential_test.cc
+++ b/test/ffmpeg_decoder_sequential_test.cc
@@ -32,6 +32,7 @@
using std::cout;
using std::cerr;
+using std::list;
using boost::shared_ptr;
using boost::optional;
@@ -57,13 +58,13 @@ test (boost::filesystem::path file, float fps, int first)
VideoFrame const N = decoder.video_content()->video_length().frames (decoder.video_content()->video_frame_rate ());
decoder.test_gaps = 0;
for (VideoFrame i = 0; i < N; ++i) {
- optional<ContentVideo> v;
+ list<ContentVideo> v;
v = decoder.get_video (i, true);
if (i < first) {
- BOOST_CHECK (!v);
+ BOOST_CHECK (v.empty ());
} else {
- BOOST_CHECK (v);
- BOOST_CHECK_EQUAL (v->frame, i);
+ BOOST_CHECK (v.size() == 1);
+ BOOST_CHECK_EQUAL (v.front().frame, i);
}
}
BOOST_CHECK_EQUAL (decoder.test_gaps, 0);