Commit a692ff93 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '9464b69d'

* commit '9464b69d':
  log: Unbreak windows support

Conflicts:
	libavutil/log.c

No change as we didnt use print_256color() in our implementation
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 7307a7fd 9464b69d
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment