From dfaa9f3cb328f245cc1f9c56145a21c6d6e58f42 Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Sat, 1 Jan 2011 20:08:15 +0000 Subject: Recognize FFMPEG_FORCE_NOCOLOR environment variable on Win32 Fixes issue 2461 Originally committed as revision 26186 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavutil/log.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavutil/log.c') diff --git a/libavutil/log.c b/libavutil/log.c index 0388e0a816..6c9e76aa24 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -55,7 +55,7 @@ static void colored_fputs(int level, const char *str){ #if defined(_WIN32) && !defined(__MINGW32CE__) CONSOLE_SCREEN_BUFFER_INFO con_info; con = GetStdHandle(STD_ERROR_HANDLE); - use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR"); + use_color = (con != INVALID_HANDLE_VALUE) && !getenv("NO_COLOR") && !getenv("FFMPEG_FORCE_NOCOLOR"); if (use_color) { GetConsoleScreenBufferInfo(con, &con_info); attr_orig = con_info.wAttributes; -- cgit v1.2.3