2.0. imag

[casparcg] / modules / ffmpeg / ffmpeg.cpp

diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp
index 6dfb68b6a0fb708bb541ffb1cadeda9d7e595862..13089c16c102ea46b7d39b31241609f092e49af3 100644 (file)
--- a/modules/ffmpeg/ffmpeg.cpp
+++ b/modules/ffmpeg/ffmpeg.cpp
@@ -135,7 +135,18 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
     strcpy(prev, line);\r
     sanitize((uint8_t*)line);\r
        \r
-       CASPAR_LOG(trace) << L"[FFMPEG] [" << av_clip(level>>3, 0, 6) << L"] " << line;\r
+       if(level == AV_LOG_DEBUG)\r
+               CASPAR_LOG(debug) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_INFO)\r
+               CASPAR_LOG(info) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_WARNING)\r
+               CASPAR_LOG(warning) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_ERROR)\r
+               CASPAR_LOG(error) << L"[ffmpeg] " << line;\r
+       else if(level == AV_LOG_FATAL)\r
+               CASPAR_LOG(fatal) << L"[ffmpeg] " << line;\r
+       else\r
+               CASPAR_LOG(trace) << L"[ffmpeg] " << line;\r
 \r
     //colored_fputs(av_clip(level>>3, 0, 6), line);\r
 }\r
@@ -149,7 +160,7 @@ void init_ffmpeg()
        av_lockmgr_register(ffmpeg_lock_callback);\r
        av_log_set_callback(log_callback);\r
        \r
-       core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
+       //core::register_consumer_factory([](const std::vector<std::wstring>& params){return create_ffmpeg_consumer(params);});\r
        core::register_producer_factory(create_ffmpeg_producer);\r
 }\r
 \r