projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More header file rearrangement.
[dcpomatic.git]
/
src
/
lib
/
encoder.h
diff --git
a/src/lib/encoder.h
b/src/lib/encoder.h
index 51df0176b575267a50ec75e5596059655811ec9e..1da5d1c96b6a67d0bc7714fcbdfd29dd9bc89bc3 100644
(file)
--- a/
src/lib/encoder.h
+++ b/
src/lib/encoder.h
@@
-24,6
+24,14
@@
* @brief Encoder to J2K and WAV for DCP.
*/
* @brief Encoder to J2K and WAV for DCP.
*/
+#include "util.h"
+#include "config.h"
+#include "cross.h"
+#include "exceptions.h"
+extern "C" {
+#include <libavutil/samplefmt.h>
+#include <libswresample/swresample.h>
+}
#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/thread/mutex.hpp>
#include <boost/thread/condition.hpp>
@@
-31,14
+39,6
@@
#include <boost/optional.hpp>
#include <list>
#include <stdint.h>
#include <boost/optional.hpp>
#include <list>
#include <stdint.h>
-extern "C" {
-#include <libavutil/samplefmt.h>
-#include <libswresample/swresample.h>
-}
-#include "util.h"
-#include "config.h"
-#include "cross.h"
-#include "exceptions.h"
class Image;
class AudioBuffers;
class Image;
class AudioBuffers;