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

diff --git a/doc/fftools-common-opts.texi b/doc/fftools-common-opts.texi
index 618441e0451bbc9c4d919de8d33a696c056bfccd..7f192f71aec5d1e05f0409148aef9cfda2a3460c 100644 (file)
--- a/doc/fftools-common-opts.texi
+++ b/doc/fftools-common-opts.texi
@@ -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

diff --git a/libavutil/log.c b/libavutil/log.c
index 0fd7c96baae53fed6834922f4282471972435b50..1975bab396af9b43f807b67293f1964ab36805c3 100644 (file)
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -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
     }