projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
eb8b8cf
)
Tidying.
author
Carl Hetherington
<cth@carlh.net>
Mon, 1 Nov 2021 22:37:30 +0000
(23:37 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Mon, 1 Nov 2021 22:37:30 +0000
(23:37 +0100)
test/vf_test.cc
patch
|
blob
|
history
diff --git
a/test/vf_test.cc
b/test/vf_test.cc
index 4db48dd60071c83b5838323169eb4c16e361a26f..810c87a9eb73ee4912aafbc1fabfed48687ee176 100644
(file)
--- a/
test/vf_test.cc
+++ b/
test/vf_test.cc
@@
-25,14
+25,14
@@
*/
*/
-#include "lib/film.h"
-#include "lib/dcp_content.h"
-#include "lib/ffmpeg_content.h"
#include "lib/content_factory.h"
#include "lib/content_factory.h"
+#include "lib/dcp_content.h"
#include "lib/dcp_content_type.h"
#include "lib/dcp_content_type.h"
-#include "lib/
video
_content.h"
-#include "lib/
referenced_reel_asset
.h"
+#include "lib/
ffmpeg
_content.h"
+#include "lib/
film
.h"
#include "lib/player.h"
#include "lib/player.h"
+#include "lib/referenced_reel_asset.h"
+#include "lib/video_content.h"
#include "test.h"
#include <dcp/cpl.h>
#include <dcp/reel.h>
#include "test.h"
#include <dcp/cpl.h>
#include <dcp/reel.h>
@@
-42,12
+42,12
@@
#include <iostream>
#include <iostream>
-using std::list;
-using std::string;
using std::cout;
using std::cout;
-using std::shared_ptr;
-using std::make_shared;
using std::dynamic_pointer_cast;
using std::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
using namespace dcpomatic;
using namespace dcpomatic;