* commit '7763118cae4eb468b032dbd29af15a011c2c233b': log: Support for 256color terminals Conflicts: doc/APIchanges libavutil/log.c libavutil/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>