#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;
{
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
);