[FFmpeg-devel] [PATCH] Add Win32 check for FFMPEG_FORCE_NOCOLOR

[Daniel Verkamp]

On Sat, Jan 1, 2011 at 11:13 AM, Michael Niedermayer <michaelni at gmx.at> wrote:
> On Fri, Dec 31, 2010 at 01:35:55PM -0700, Daniel Verkamp wrote:
>> Hi,
>>
>> Currently the Win32 path of libavutil/log.c only checks the NO_COLOR
>> environment variable; a check for the recently-added
>> FFMPEG_FORCE_NOCOLOR is missing.
>>
>> This fixes issue 2461.
>>
>> Thanks,
>> -- Daniel Verkamp
>
>> Index: libavutil/log.c
>> ===================================================================
>> --- libavutil/log.c ? (revision 26178)
>> +++ libavutil/log.c ? (working copy)
>> @@ -55,7 +55,7 @@
>> ?#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");
>
> ok

Applied