projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
util.cc
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 0fced638cc47ad8954f8fe0ad9825d348e5a3498..ef6f46575f32ada59bb6a7923d0fa56277db5cbf 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-43,6
+43,7
@@
#include <magick/MagickCore.h>
#include <magick/version.h>
#include <libdcp/version.h>
#include <magick/MagickCore.h>
#include <magick/version.h>
#include <libdcp/version.h>
+#include <libdcp/util.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
extern "C" {
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
@@
-230,6
+231,8
@@
seconds (struct timeval t)
void
dvdomatic_setup ()
{
void
dvdomatic_setup ()
{
+ libdcp::init ();
+
Format::setup_formats ();
DCPContentType::setup_dcp_content_types ();
Scaler::setup_scalers ();
Format::setup_formats ();
DCPContentType::setup_dcp_content_types ();
Scaler::setup_scalers ();