Merge remote-tracking branch 'qatar/master'

* qatar/master:
  log: Do not assume the TERM variable is always set

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/64/head
Michael Niedermayer 11 years ago
commit 5a18b215f7
  1. 2
      libavutil/log.c

@ -130,7 +130,7 @@ static void check_color_terminal(void)
use_color = !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR") &&
(getenv("TERM") && isatty(2) || getenv("AV_LOG_FORCE_COLOR"));
if ( getenv("AV_LOG_FORCE_256COLOR")
|| strstr(term, "256color"));
|| (term && strstr(term, "256color")));
use_color *= 256;
#else
use_color = getenv("AV_LOG_FORCE_COLOR") && !getenv("NO_COLOR") &&

Loading…
Cancel
Save