RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-30 03:12:08 +00:00
Code Issues Projects Releases Wiki Activity

Allow to force colored output.

Browse Source 
Patch by Etienne Buira, etienne d buira d lists a free d fr

Originally committed as revision 25888 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Etienne Buira 2010-12-05 13:56:49 +00:00 committed by Carl Eugen Hoyos
parent 35b0169484
commit 129983408d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/fftools-common-opts.texi
View File

@ -84,6 +84,7 @@ Set the logging level used by the library.
By default the program logs to stderr, if coloring is supported by the By default the program logs to stderr, if coloring is supported by the
terminal, colors are used to mark errors and warnings. Log coloring terminal, colors are used to mark errors and warnings. Log coloring
can be disabled setting the environment variable @env{NO_COLOR}. can be disabled setting the environment variable @env{NO_COLOR}, or can
be forced setting the environment variable @env{FFMPEG_FORCE_COLOR}.
@end table @end table

4
libavutil/log.c
View File

@ -62,9 +62,9 @@ static void colored_fputs(int level, const char *str){
background = attr_orig & 0xF0; background = attr_orig & 0xF0;
} }
#elif HAVE_ISATTY #elif HAVE_ISATTY
use_color= getenv("TERM") && !getenv("NO_COLOR") && isatty(2); use_color= !getenv("NO_COLOR") && (getenv("TERM") && isatty(2) || getenv("FFMPEG_FORCE_COLOR"));
#else #else
use_color= 0; use_color= getenv("FFMPEG_FORCE_COLOR") && !getenv("NO_COLOR");
#endif #endif
} }