diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-05-21 22:34:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-05-21 22:34:49 +0100 |
| commit | 2935d9d158cf35496a35107f9c4ab7d2929cf6c3 (patch) | |
| tree | ded31322feaf0279962127ab45e072b4bc3c1f72 /src/lib/ffmpeg_decoder.cc | |
| parent | fc888176a978d11e9d5487d3afce33cdf92e1342 (diff) | |
Try to fix clashes caused by ERROR, WARNING etc. as variables.
Diffstat (limited to 'src/lib/ffmpeg_decoder.cc')
| -rw-r--r-- | src/lib/ffmpeg_decoder.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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; |