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)
commit5a5d454dcce5add7674503f94bc2dc965f2fa111
treeabe454bfa47e1b12a1dbb123c6456f97e53d921c
parenta9ea79bb4976382b5648647013290ab61cf031e7
parentd995f0a1550c9148140eab34c7d770e90925c004
Merge commit 'd995f0a1550c9148140eab34c7d770e90925c004'

* 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>