Merge commit '99e22b7859177f6d3ed6121040924b337dce5497'

[ffmpeg] / libavutil / log.c

diff --git a/libavutil/log.c b/libavutil/log.c
index 32e1ba74c4d98fd2c3f7f2e0cfa4e57b8c834977..cf4d990b6cf1dff659793696be335b8271e3657c 100644 (file)
--- a/libavutil/log.c
+++ b/libavutil/log.c
@@ -140,20 +140,24 @@ static void check_color_terminal(void)
 
 static void colored_fputs(int level, int tint, const char *str)
 {
+    int local_use_color;
     if (!*str)
         return;
 
     if (use_color < 0)
         check_color_terminal();
 
+    if (level == AV_LOG_INFO/8) local_use_color = 0;
+    else                        local_use_color = use_color;
+
 #if defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE
-    if (use_color && level != AV_LOG_INFO/8)
+    if (local_use_color)
         SetConsoleTextAttribute(con, background | color[level]);
     fputs(str, stderr);
-    if (use_color && level != AV_LOG_INFO/8)
+    if (local_use_color)
         SetConsoleTextAttribute(con, attr_orig);
 #else
-    if (use_color == 1 && level != AV_LOG_INFO/8) {
+    if (local_use_color == 1) {
         fprintf(stderr,
                 "\033[%d;3%dm%s\033[0m",
                 (color[level] >> 4) & 15,
@@ -165,7 +169,7 @@ static void colored_fputs(int level, int tint, const char *str)
                 (color[level] >> 16) & 0xff,
                 tint,
                 str);
-    } else if (use_color == 256 && level != AV_LOG_INFO/8) {
+    } else if (local_use_color == 256) {
         fprintf(stderr,
                 "\033[48;5;%dm\033[38;5;%dm%s\033[0m",
                 (color[level] >> 16) & 0xff,
@@ -341,6 +345,11 @@ void av_log_set_flags(int arg)
     flags = arg;
 }
 
+int av_log_get_flags(void)
+{
+    return flags;
+}
+
 void av_log_set_callback(void (*callback)(void*, int, const char*, va_list))
 {
     av_log_callback = callback;