projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fa64b23
)
Comment.
author
Carl Hetherington
<cth@carlh.net>
Thu, 18 Jun 2015 14:34:21 +0000
(15:34 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Thu, 18 Jun 2015 14:34:21 +0000
(15:34 +0100)
test/player_test.cc
patch
|
blob
|
history
diff --git
a/test/player_test.cc
b/test/player_test.cc
index 29b0b4d1f54cdbfb62334107a9181e02258129d5..b9038dcce09fb374ba635553013913a83ac5f438 100644
(file)
--- a/
test/player_test.cc
+++ b/
test/player_test.cc
@@
-40,6
+40,8
@@
BOOST_AUTO_TEST_CASE (player_overlaps_test)
{
shared_ptr<Film> film = new_test_film ("player_overlaps_test");
film->set_container (Ratio::from_id ("185"));
+
+ /* This content is 3s long */
shared_ptr<FFmpegContent> A (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<FFmpegContent> B (new FFmpegContent (film, "test/data/test.mp4"));
shared_ptr<FFmpegContent> C (new FFmpegContent (film, "test/data/test.mp4"));