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/skip_frame_test.cc | |
| parent | 5af65f61bf6eba06c24025d63b43aec896a00c9c (diff) | |
Hand-apply bbfb370d7de28ec1e8f307865cc6253bb5d4366e from master; quicker digest calculation.
Diffstat (limited to 'test/skip_frame_test.cc')
| -rw-r--r-- | test/skip_frame_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/skip_frame_test.cc b/test/skip_frame_test.cc index 3e4f895c5..dac7b5a25 100644 --- a/test/skip_frame_test.cc +++ b/test/skip_frame_test.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2014 Carl Hetherington <cth@carlh.net> + Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE (skip_frame_test) film->set_container (Ratio::from_id ("185")); film->set_dcp_content_type (DCPContentType::from_pretty_name ("Test")); shared_ptr<FFmpegContent> c (new FFmpegContent (film, "test/data/count300bd48.m2ts")); - film->examine_and_add_content (c, true); + film->examine_and_add_content (c); wait_for_jobs (); |