diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-01-24 17:41:00 +0000 |
| commit | 59e769023c392c332331567a1aea94660002c463 (patch) | |
| tree | e68d918e3c48f470a688b8bb5bf95590fb9c4916 /test/play_test.cc | |
| parent | 5af65f61bf6eba06c24025d63b43aec896a00c9c (diff) | |
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calculation.
Diffstat (limited to 'test/play_test.cc')
| -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 f7aa52d6f..bbf70781a 100644 --- a/test/play_test.cc +++ b/test/play_test.cc @@ -87,13 +87,13 @@ BOOST_AUTO_TEST_CASE (play_test) film->set_name ("play_test"); shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/red_24.mp4")); - film->examine_and_add_content (A, true); + film->examine_and_add_content (A); wait_for_jobs (); BOOST_CHECK_EQUAL (A->video_length_after_3d_combine(), 16); shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/red_30.mp4")); - film->examine_and_add_content (B, true); + film->examine_and_add_content (B); wait_for_jobs (); BOOST_CHECK_EQUAL (B->video_length_after_3d_combine(), 16); |