Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 23:29:24 +0000 (01:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 26 Sep 2014 23:29:24 +0000 (01:29 +0200)
* commit 'd995f0a1550c9148140eab34c7d770e90925c004':
  log: Unbreak no-tty support on 256color terminals

Conflicts:
libavutil/log.c

No change, FFmpeg is not affected by this bug

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

Trivial merge