From 2935d9d158cf35496a35107f9c4ab7d2929cf6c3 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 May 2014 22:34:49 +0100 Subject: Try to fix clashes caused by ERROR, WARNING etc. as variables. --- src/lib/ffmpeg_decoder.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/ffmpeg_decoder.cc') diff --git a/src/lib/ffmpeg_decoder.cc b/src/lib/ffmpeg_decoder.cc index 6351c7e22..5fe34ce14 100644 --- a/src/lib/ffmpeg_decoder.cc +++ b/src/lib/ffmpeg_decoder.cc @@ -46,9 +46,9 @@ extern "C" { #include "i18n.h" -#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::GENERAL); -#define LOG_ERROR(...) film->log()->log (String::compose (__VA_ARGS__), Log::ERROR); -#define LOG_WARNING(...) film->log()->log (__VA_ARGS__, Log::WARNING); +#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_GENERAL); +#define LOG_ERROR(...) film->log()->log (String::compose (__VA_ARGS__), Log::TYPE_ERROR); +#define LOG_WARNING(...) film->log()->log (__VA_ARGS__, Log::TYPE_WARNING); using std::cout; using std::string; -- cgit v1.2.3