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/environment_info.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/environment_info.cc')
| -rw-r--r-- | src/lib/environment_info.cc | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc index 6fb75a037..68496f996 100644 --- a/src/lib/environment_info.cc +++ b/src/lib/environment_info.cc @@ -24,21 +24,6 @@ #include "cross.h" #include <dcp/version.h> #include <libssh/libssh.h> -#ifdef DCPOMATIC_IMAGE_MAGICK -/* ImageMagick */ -#ifdef DCPOMATIC_MAGICKCORE_MAGICK -#include <magick/MagickCore.h> -#include <magick/version.h> -#else -#include <MagickCore/MagickCore.h> -#include <MagickCore/version.h> -#endif -#else -/* GraphicsMagick */ -#include <magick/common.h> -#include <magick/magick_config.h> -#include <magick/version.h> -#endif extern "C" { #include <libavcodec/avcodec.h> #include <libavformat/avformat.h> @@ -77,13 +62,12 @@ dependency_version_summary () { char buffer[512]; snprintf ( - buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, %s, libssh %s, libdcp %s git %s", + buffer, sizeof(buffer), "libavcodec %s, libavfilter %s, libavformat %s, libavutil %s, libswscale %s, libssh %s, libdcp %s git %s", ffmpeg_version_to_string(avcodec_version()).c_str(), ffmpeg_version_to_string(avfilter_version()).c_str(), ffmpeg_version_to_string(avformat_version()).c_str(), ffmpeg_version_to_string(avutil_version()).c_str(), ffmpeg_version_to_string(swscale_version()).c_str(), - MagickVersion, ssh_version(0), dcp::version, dcp::git_commit ); |