diff options
| author | Carl Hetherington <cth@carlh.net> | 2015-04-24 22:26:26 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2015-04-24 22:26:26 +0100 |
| commit | 2898a88b4554335439891d8198bed8c820c20396 (patch) | |
| tree | 8628745874397d02b4f646caad1a3b40fc41db64 | |
| parent | 06959faf429d1118e16e71900148c1ba16118be4 (diff) | |
| parent | cec1f7a6a7c6622f37c8bfae36b1a72aefbfe339 (diff) | |
Merge branch '2.0' of ssh://main.carlh.net/home/carl/git/dcpomatic into 2.0
| -rw-r--r-- | TO_PORT | 5 | ||||
| -rw-r--r-- | test/recover_test.cc | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1 +1,6 @@ +291179175729b62e17a9c322cd27ae134d1310d9 +8d92cce7d2885afa13ee4cb6f546dbf43942124b +c994839239e84a1f62865ed82fdc090900a66b03 +1114df4c0d2167f6b7b394bfbf85890cd0a4a3e3 +03bee41ebb15a9ddd61af1607426d22d906ad226 diff --git a/test/recover_test.cc b/test/recover_test.cc index c2a335cfa..09f7a1249 100644 --- a/test/recover_test.cc +++ b/test/recover_test.cc @@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE (recover_test) film->make_dcp (); wait_for_jobs (); - boost::filesystem::path const video = "build/test/recover_test/video/185_2K_e01c58c5783da57b689e65d9123ad3a3_24_100000000_P_S_3D.mxf"; + boost::filesystem::path const video = "build/test/recover_test/video/185_2K_262d2f711190093815aa9f18c99495ce_24_100000000_P_S_3D.mxf"; boost::filesystem::copy_file ( video, |