X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fenvironment_info.cc;h=31279acfbf539b1be227542d9194af3ebd4a0ab2;hb=fa5f3a8bf77209da27acc33cf144e2e4500a2600;hp=7d8603697a8691fc6f01d74a503aa320588d7e7f;hpb=b1d6f1bf8e8467e26a217681f36e155afe80f540;p=dcpomatic.git

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 7d8603697..31279acfb 100644
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -24,27 +24,17 @@
 #include "cross.h"
 #include <dcp/version.h>
 #include <libssh/libssh.h>
-#ifdef DCPOMATIC_IMAGE_MAGICK
-#include <magick/MagickCore.h>
-#else
-#include <magick/common.h>
-#include <magick/magick_config.h>
-#endif
-#include <magick/version.h>
 extern "C" {
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
+#include <libavfilter/avfilter.h>
 #include <libswscale/swscale.h>
-#include <libavfilter/avfiltergraph.h>
 #include <libavutil/pixfmt.h>
 }
 #include <boost/thread.hpp>
 
 #include "i18n.h"
 
-#define LOG_GENERAL(...) log->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
-#define LOG_GENERAL_NC(...) log->log (__VA_ARGS__, LogEntry::TYPE_GENERAL);
-
 using std::string;
 using std::list;
 using std::pair;
@@ -69,13 +59,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
 		);