Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'

Browse Source

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

Conflicts:
	libavutil/log.c

No change as we didnt use print_256color() in our implementation

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer

2014-04-04 02:08:24 +02:00

parent 7307a7fd93 9464b69da6

commit a692ff93ef

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available