]> git.sesse.net Git - casparcg/commitdiff
git-svn-id: https://casparcg.svn.sourceforge.net/svnroot/casparcg/server/branches...
authorronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 10 Aug 2011 10:35:42 +0000 (10:35 +0000)
committerronag <ronag@362d55ac-95cf-4e76-9f9a-cbaa9c17b72d>
Wed, 10 Aug 2011 10:35:42 +0000 (10:35 +0000)
modules/ffmpeg/ffmpeg.cpp
modules/ffmpeg/producer/input.cpp

index ae0e4240faffd1dccf51135b21d4adf3e497cb06..13089c16c102ea46b7d39b31241609f092e49af3 100644 (file)
@@ -136,17 +136,17 @@ void log_callback(void* ptr, int level, const char* fmt, va_list vl)
     sanitize((uint8_t*)line);\r
        \r
        if(level == AV_LOG_DEBUG)\r
-               CASPAR_LOG(debug) << L"[FFMPEG] " << line;\r
+               CASPAR_LOG(debug) << L"[ffmpeg] " << line;\r
        else if(level == AV_LOG_INFO)\r
-               CASPAR_LOG(info) << L"[FFMPEG] " << line;\r
+               CASPAR_LOG(info) << L"[ffmpeg] " << line;\r
        else if(level == AV_LOG_WARNING)\r
-               CASPAR_LOG(warning) << L"[FFMPEG] " << line;\r
+               CASPAR_LOG(warning) << L"[ffmpeg] " << line;\r
        else if(level == AV_LOG_ERROR)\r
-               CASPAR_LOG(error) << L"[FFMPEG] " << line;\r
+               CASPAR_LOG(error) << L"[ffmpeg] " << line;\r
        else if(level == AV_LOG_FATAL)\r
-               CASPAR_LOG(fatal) << L"[FFMPEG] " << line;\r
+               CASPAR_LOG(fatal) << L"[ffmpeg] " << line;\r
        else\r
-               CASPAR_LOG(trace) << L"[FFMPEG] " << line;\r
+               CASPAR_LOG(trace) << L"[ffmpeg] " << line;\r
 \r
     //colored_fputs(av_clip(level>>3, 0, 6), line);\r
 }\r
index 04dc3a5dbbd86ea35fa4ee994881ece42dce0a7c..3a9565a826e86ab93d60faee182818516479d76e 100644 (file)
@@ -98,7 +98,7 @@ public:
 \r
                format_context_.reset(weak_format_context_, av_close_input_file);\r
 \r
-               av_dump_format(weak_format_context_, 0, narrow(filename).c_str(), 0);\r
+               //av_dump_format(weak_format_context_, 0, narrow(filename).c_str(), 0);\r
                        \r
                THROW_ON_ERROR2(avformat_find_stream_info(format_context_.get(), nullptr), print());\r
                \r