diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-21 12:36:17 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-21 12:36:17 +0000 |
| commit | e6f28e7cda23c1ba3c49cc1bf2dc1491c2f87160 (patch) | |
| tree | ab7de2b131c3543d170b167c8b93ea2113ac112e /test | |
| parent | 76f601f5edbdfceec91ff6f6ce4b310e0d3a6ce9 (diff) | |
| parent | 4ec7a8070dfcda1fa327df6378eaab754f119f1b (diff) | |
Mostly-merge master.
Diffstat (limited to 'test')
| -rw-r--r-- | test/play_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/play_test.cc b/test/play_test.cc index 690b042d8..ed3e497ed 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -89,13 +89,13 @@ BOOST_AUTO_TEST_CASE (play_test) film->examine_and_add_content (A); wait_for_jobs (); - BOOST_CHECK_EQUAL (A->video_length().frames (24), 16); + BOOST_CHECK_EQUAL (A->video_length_after_3d_combine().frames (24), 16); shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4")); film->examine_and_add_content (B); wait_for_jobs (); - BOOST_CHECK_EQUAL (B->video_length().frames (30), 16); + BOOST_CHECK_EQUAL (B->video_length_after_3d_combine().frames (30), 16); /* Film should have been set to 25fps */ BOOST_CHECK_EQUAL (film->video_frame_rate(), 25); |