projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add an option to dump the decryption certificate from the KDM CLI.
[dcpomatic.git]
/
test
/
ffmpeg_dcp_test.cc
diff --git
a/test/ffmpeg_dcp_test.cc
b/test/ffmpeg_dcp_test.cc
index 0d56f4290fd1788db1e655773717e5274df96e71..c332759c8f96c6dbab245fdc717d74370cef3c96 100644
(file)
--- a/
test/ffmpeg_dcp_test.cc
+++ b/
test/ffmpeg_dcp_test.cc
@@
-27,19
+27,18
@@
*/
*/
-#include <boost/test/unit_test.hpp>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include "lib/film.h"
+#include "lib/dcp_content_type.h"
#include "lib/ffmpeg_content.h"
#include "lib/ffmpeg_content.h"
+#include "lib/film.h"
#include "lib/ratio.h"
#include "lib/ratio.h"
-#include "lib/dcp_content_type.h"
#include "lib/video_content.h"
#include "test.h"
#include "lib/video_content.h"
#include "test.h"
+#include <boost/algorithm/string.hpp>
+#include <boost/filesystem.hpp>
+#include <boost/test/unit_test.hpp>
using std::make_shared;
using std::make_shared;
-using std::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
BOOST_AUTO_TEST_CASE (ffmpeg_dcp_test)
@@
-69,7
+68,7
@@
BOOST_AUTO_TEST_CASE (ffmpeg_have_dcp_test, * boost::unit_test::depends_on("ffmp
p /= film->dcp_name();
auto i = boost::filesystem::directory_iterator (p);
p /= film->dcp_name();
auto i = boost::filesystem::directory_iterator (p);
- while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with
(i->path().leaf
().string(), "j2c")) {
+ while (i != boost::filesystem::directory_iterator() && !boost::algorithm::starts_with
(i->path().filename
().string(), "j2c")) {
++i;
}
++i;
}