diff options
| author | Daniel Verkamp <daniel@drv.nu> | 2011-01-01 20:08:15 +0000 |
|---|---|---|
| committer | Daniel Verkamp <daniel@drv.nu> | 2011-01-01 20:08:15 +0000 |
| commit | dfaa9f3cb328f245cc1f9c56145a21c6d6e58f42 (patch) | |
| tree | 6048e8ad46fc20766e17ed3b97f3ed992722d2e0 | |
| parent | 0a3028b9b0c531b6c61076be22b88fa64c27332c (diff) | |
| download | ffmpeg-dfaa9f3cb328f245cc1f9c56145a21c6d6e58f42.tar.gz | |
Recognize FFMPEG_FORCE_NOCOLOR environment variable on Win32
Fixes issue 2461
Originally committed as revision 26186 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavutil/log.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |