Barely-functioning GL playback with new arrangement.

[dcpomatic.git] / src / lib / environment_info.cc

diff --git a/src/lib/environment_info.cc b/src/lib/environment_info.cc
index 0956d003dcf266f151d4e9e695d833af84ac7e4d..31279acfbf539b1be227542d9194af3ebd4a0ab2 100644 (file)
--- a/src/lib/environment_info.cc
+++ b/src/lib/environment_info.cc
@@ -24,35 +24,17 @@
 #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>
+#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;
@@ -77,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
                );