projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
[dcpomatic.git]
/
src
/
lib
/
util.cc
diff --git
a/src/lib/util.cc
b/src/lib/util.cc
index 909a93ba8a368aadb8b241571a1a6ad640a1edc8..051a4bb25ec9e0b84fe6aa0d890ed4bf6f88f469 100644
(file)
--- a/
src/lib/util.cc
+++ b/
src/lib/util.cc
@@
-49,9
+49,6
@@
extern "C" {
#include <libavcodec/avcodec.h>
}
#include <curl/curl.h>
#include <libavcodec/avcodec.h>
}
#include <curl/curl.h>
-#ifdef DCPOMATIC_GRAPHICS_MAGICK
-#include <Magick++.h>
-#endif
#include <glib.h>
#include <pangomm/init.h>
#include <boost/algorithm/string.hpp>
#include <glib.h>
#include <pangomm/init.h>
#include <boost/algorithm/string.hpp>
@@
-372,10
+369,6
@@
dcpomatic_setup ()
curl_global_init (CURL_GLOBAL_ALL);
curl_global_init (CURL_GLOBAL_ALL);
-#ifdef DCPOMATIC_GRAPHICS_MAGICK
- Magick::InitializeMagick (0);
-#endif
-
ui_thread = boost::this_thread::get_id ();
}
ui_thread = boost::this_thread::get_id ();
}