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

Move ansi color array to outside of av_log_default_callback(). Do not pass

Browse Source 
ansi color code to colored_fputs(), and pass instead the error level so the
proper color code may be used.

Originally committed as revision 23553 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Ramiro Polla
2010-06-09 18:10:35 +00:00
parent a1c027e9e4
commit 6e34a5582d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavutil/log.c
View File

@@ -34,10 +34,11 @@ static
#endif #endif
int av_log_level = AV_LOG_INFO; int av_log_level = AV_LOG_INFO;
static const uint8_t color[]={0x41,0x41,0x11,0x03,9,9,9};
static int use_color=-1; static int use_color=-1;
#undef fprintf #undef fprintf
static void colored_fputs(int color, const char *str){ static void colored_fputs(int level, const char *str){
if(use_color<0){ if(use_color<0){
#if HAVE_ISATTY && !defined(_WIN32) #if HAVE_ISATTY && !defined(_WIN32)
use_color= getenv("TERM") && !getenv("NO_COLOR") && isatty(2); use_color= getenv("TERM") && !getenv("NO_COLOR") && isatty(2);
@@ -47,7 +48,7 @@ static void colored_fputs(int color, const char *str){
} }
if(use_color){ if(use_color){
fprintf(stderr, "\033[%d;3%dm", color>>4, color&15); fprintf(stderr, "\033[%d;3%dm", color[level]>>4, color[level]&15);
} }
fputs(str, stderr); fputs(str, stderr);
if(use_color){ if(use_color){
@@ -64,7 +65,6 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
static int print_prefix=1; static int print_prefix=1;
static int count; static int count;
static char line[1024], prev[1024]; static char line[1024], prev[1024];
static const uint8_t color[]={0x41,0x41,0x11,0x03,9,9,9};
AVClass* avc= ptr ? *(AVClass**)ptr : NULL; AVClass* avc= ptr ? *(AVClass**)ptr : NULL;
if(level>av_log_level) if(level>av_log_level)
return; return;
@@ -91,7 +91,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
fprintf(stderr, " Last message repeated %d times\n", count); fprintf(stderr, " Last message repeated %d times\n", count);
count=0; count=0;
} }
colored_fputs(color[av_clip(level>>3, 0, 6)], line); colored_fputs(av_clip(level>>3, 0, 6), line);
strcpy(prev, line); strcpy(prev, line);
} }