[FFmpeg-cvslog] log: Unbreak no-tty support on 256color terminals

Luca Barbato git at videolan.org
Sat Sep 27 01:34:38 CEST 2014


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Sat Sep 13 00:26:21 2014 +0200| [d995f0a1550c9148140eab34c7d770e90925c004] | committer: Luca Barbato

log: Unbreak no-tty support on 256color terminals

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d995f0a1550c9148140eab34c7d770e90925c004
---

 libavutil/log.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavutil/log.c b/libavutil/log.c
index 5a8f293..d38e40b 100644
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -75,7 +75,8 @@ 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 += term && strstr(term, "256color");
+    if (use_color)
+        use_color += term && strstr(term, "256color");
 #else
     use_color = getenv("AV_LOG_FORCE_COLOR") && !getenv("NO_COLOR") &&
                !getenv("AV_LOG_FORCE_NOCOLOR");



More information about the ffmpeg-cvslog mailing list