Browse Source

Allow to force colored output.

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
tags/n0.8
Etienne Buira Carl Eugen Hoyos 14 years ago
parent
commit
129983408d
2 changed files with 4 additions and 3 deletions
  1. +2
    -1
      doc/fftools-common-opts.texi
  2. +2
    -2
      libavutil/log.c

+ 2
- 1
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
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

+ 2
- 2
libavutil/log.c View File

@@ -62,9 +62,9 @@ static void colored_fputs(int level, const char *str){
background = attr_orig & 0xF0;
}
#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
use_color= 0;
use_color= getenv("FFMPEG_FORCE_COLOR") && !getenv("NO_COLOR");
#endif
}



Loading…
Cancel
Save