summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-11-21 14:30:21 +0100
committerCarl Hetherington <cth@carlh.net>2021-11-22 23:59:43 +0100
commitd930131bac027fb37af01c2326f5a76ebc23fef7 (patch)
tree14a51294bf8ec57c552eb29bc27791694cf4c5a1
parent20f16e4370e0ed73daeb6a0b3f230f957964b241 (diff)
Tidying.
-rw-r--r--src/lib/j2k_encoder.cc2
-rw-r--r--src/lib/j2k_encoder.h10
2 files changed, 4 insertions, 8 deletions
diff --git a/src/lib/j2k_encoder.cc b/src/lib/j2k_encoder.cc
index b2513b72e..fae7752cf 100644
--- a/src/lib/j2k_encoder.cc
+++ b/src/lib/j2k_encoder.cc
@@ -46,14 +46,12 @@
#include "i18n.h"
-using std::list;
using std::cout;
using std::exception;
using std::shared_ptr;
using std::weak_ptr;
using std::make_shared;
using boost::optional;
-using dcp::Data;
using namespace dcpomatic;
diff --git a/src/lib/j2k_encoder.h b/src/lib/j2k_encoder.h
index fdb321752..2139eee3d 100644
--- a/src/lib/j2k_encoder.h
+++ b/src/lib/j2k_encoder.h
@@ -28,17 +28,15 @@
*/
-#include "util.h"
#include "cross.h"
#include "event_history.h"
#include "exception_store.h"
-#include "j2k_encoder_cpu_backend.h"
-#include "j2k_encoder_remote_backend.h"
-#include <boost/thread/mutex.hpp>
-#include <boost/thread/condition.hpp>
-#include <boost/thread.hpp>
+#include "util.h"
#include <boost/optional.hpp>
#include <boost/signals2.hpp>
+#include <boost/thread.hpp>
+#include <boost/thread/condition.hpp>
+#include <boost/thread/mutex.hpp>
#include <list>
#include <stdint.h>