From: ronag Date: Wed, 10 Aug 2011 10:35:42 +0000 (+0000) Subject: git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches... X-Git-Tag: 2.0.1~217 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=8b22211b6fe364dd69c09dede3984c6e5fba61ca;p=casparcg git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches/2.0.0.2@1123 362d55ac-95cf-4e76-9f9a-cbaa9c17b72d --- diff --git a/modules/ffmpeg/ffmpeg.cpp b/modules/ffmpeg/ffmpeg.cpp index ae0e4240f..13089c16c 100644 --- a/modules/ffmpeg/ffmpeg.cpp +++ b/modules/ffmpeg/ffmpeg.cpp @@ -136,17 +136,17 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl) sanitize((uint8_t*)line); if(level == AV_LOG_DEBUG) - CASPAR_LOG(debug) << L"[FFMPEG] " << line; + CASPAR_LOG(debug) << L"[ffmpeg] " << line; else if(level == AV_LOG_INFO) - CASPAR_LOG(info) << L"[FFMPEG] " << line; + CASPAR_LOG(info) << L"[ffmpeg] " << line; else if(level == AV_LOG_WARNING) - CASPAR_LOG(warning) << L"[FFMPEG] " << line; + CASPAR_LOG(warning) << L"[ffmpeg] " << line; else if(level == AV_LOG_ERROR) - CASPAR_LOG(error) << L"[FFMPEG] " << line; + CASPAR_LOG(error) << L"[ffmpeg] " << line; else if(level == AV_LOG_FATAL) - CASPAR_LOG(fatal) << L"[FFMPEG] " << line; + CASPAR_LOG(fatal) << L"[ffmpeg] " << line; else - CASPAR_LOG(trace) << L"[FFMPEG] " << line; + CASPAR_LOG(trace) << L"[ffmpeg] " << line; //colored_fputs(av_clip(level>>3, 0, 6), line); } diff --git a/modules/ffmpeg/producer/input.cpp b/modules/ffmpeg/producer/input.cpp index 04dc3a5db..3a9565a82 100644 --- a/modules/ffmpeg/producer/input.cpp +++ b/modules/ffmpeg/producer/input.cpp @@ -98,7 +98,7 @@ public: format_context_.reset(weak_format_context_, av_close_input_file); - av_dump_format(weak_format_context_, 0, narrow(filename).c_str(), 0); + //av_dump_format(weak_format_context_, 0, narrow(filename).c_str(), 0); THROW_ON_ERROR2(avformat_find_stream_info(format_context_.get(), nullptr), print());