diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-10-12 00:46:00 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-10-12 00:46:00 +0100 |
| commit | 72b11d5eb036651b6ff68edf3ed270e8fc52960f (patch) | |
| tree | c6b88de5c86696f186c93322d50fd954d09c9349 /src/lib/util.cc | |
| parent | c4ac1ba47652884a647103ec49b2de4c0b6e60a9 (diff) | |
Change MagickImageProxy to FFmpegImageProxy and make it use FFmpeg
to decode images. Hence remove {Image,Graphics}Magick.
Diffstat (limited to 'src/lib/util.cc')
| -rw-r--r-- | src/lib/util.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/src/lib/util.cc b/src/lib/util.cc index 909a93ba8..051a4bb25 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -49,9 +49,6 @@ extern "C" { #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> @@ -372,10 +369,6 @@ dcpomatic_setup () curl_global_init (CURL_GLOBAL_ALL); -#ifdef DCPOMATIC_GRAPHICS_MAGICK - Magick::InitializeMagick (0); -#endif - ui_thread = boost::this_thread::get_id (); } |