[SCM] libav/experimental: log: Do not assume the TERM variable is always set
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:35 UTC 2014
The following commit has been merged in the experimental branch:
commit 4ede1862dc62f4cac030a171099d8ec8a9b079ab
Author: Luca Barbato <lu_zero at gentoo.org>
Date: Thu Apr 3 14:29:34 2014 +0000
log: Do not assume the TERM variable is always set
diff --git a/libavutil/log.c b/libavutil/log.c
index 6522ef3..af86eff 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -74,7 +74,7 @@ static void check_color_terminal(void)
char *term = getenv("TERM");
use_color = !getenv("NO_COLOR") && !getenv("AV_LOG_FORCE_NOCOLOR") &&
(getenv("TERM") && isatty(2) || getenv("AV_LOG_FORCE_COLOR"));
- use_color += !!strstr(term, "256color") ;
+ use_color += term && strstr(term, "256color");
#else
use_color = getenv("AV_LOG_FORCE_COLOR") && !getenv("NO_COLOR") &&
!getenv("AV_LOG_FORCE_NOCOLOR");
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list