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
oldabi
Etienne Buira 14 years ago committed by Carl Eugen Hoyos
parent 35b0169484
commit 129983408d
  1. 3
      doc/fftools-common-opts.texi
  2. 4
      libavutil/log.c

@ -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

@ -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
} }

Loading…
Cancel
Save