RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6' 

* commit '28b9ac4e48f3405a82e8e87ead336188215cf1e6':
  log: Remove undefined behaviour

Conflicts:
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-04-03 20:53:30 +02:00
parent c16e006181 28b9ac4e48
commit 002feaf6e2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/log.c
View File

@ -258,7 +258,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
char line[LINE_SZ]; char line[LINE_SZ];
static int is_atty; static int is_atty;
int type[2]; int type[2];
int tint = av_clip(level >> 8, 0, 256); unsigned tint = level & 0xff00;
level &= 0xff; level &= 0xff;
@ -294,7 +294,7 @@ void av_log_default_callback(void* ptr, int level, const char* fmt, va_list vl)
sanitize(part[1].str); sanitize(part[1].str);
colored_fputs(type[1], 0, part[1].str); colored_fputs(type[1], 0, part[1].str);
sanitize(part[2].str); sanitize(part[2].str);
colored_fputs(av_clip(level >> 3, 0, 6), tint, part[2].str); colored_fputs(av_clip(level >> 3, 0, 6), tint >> 8, part[2].str);
end: end:
av_bprint_finalize(part+2, NULL); av_bprint_finalize(part+2, NULL);
#if HAVE_PTHREADS #if HAVE_PTHREADS