generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avutil/log: factor "level != AV_LOG_INFO/8" checks out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-09 16:30:16 +02:00
parent dddacf780f
commit 7ac2f7e413
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavutil/log.c
View File

@ -140,20 +140,24 @@ static void check_color_terminal(void)
static void colored_fputs(int level, int tint, const char *str) static void colored_fputs(int level, int tint, const char *str)
{ {
int local_use_color;
if (!*str) if (!*str)
return; return;
if (use_color < 0) if (use_color < 0)
check_color_terminal(); 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 defined(_WIN32) && !defined(__MINGW32CE__) && HAVE_SETCONSOLETEXTATTRIBUTE
if (use_color && level != AV_LOG_INFO/8) if (local_use_color)
SetConsoleTextAttribute(con, background | color[level]); SetConsoleTextAttribute(con, background | color[level]);
fputs(str, stderr); fputs(str, stderr);
if (use_color && level != AV_LOG_INFO/8) if (local_use_color)
SetConsoleTextAttribute(con, attr_orig); SetConsoleTextAttribute(con, attr_orig);
#else #else
if (use_color == 1 && level != AV_LOG_INFO/8) { if (local_use_color == 1) {
fprintf(stderr, fprintf(stderr,
"\033[%d;3%dm%s\033[0m", "\033[%d;3%dm%s\033[0m",
(color[level] >> 4) & 15, (color[level] >> 4) & 15,
@ -165,7 +169,7 @@ static void colored_fputs(int level, int tint, const char *str)
(color[level] >> 16) & 0xff, (color[level] >> 16) & 0xff,
tint, tint,
str); str);
} else if (use_color == 256 && level != AV_LOG_INFO/8) { } else if (local_use_color == 256) {
fprintf(stderr, fprintf(stderr,
"\033[48;5;%dm\033[38;5;%dm%s\033[0m", "\033[48;5;%dm\033[38;5;%dm%s\033[0m",
(color[level] >> 16) & 0xff, (color[level] >> 16) & 0xff,