* 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>pull/86/head
commit
5a5d454dcc