Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 18:40:33 +0000 (20:40 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 3 Apr 2014 18:44:14 +0000 (20:44 +0200)
commitc16e00618122a7f1217f5174a6c4013eb57421b0
treea89cf01819d097408ed3ce96d3d7cc28e399149e
parent061e340c05bde91ac988677e47bc562b04be5c20
parent7763118cae4eb468b032dbd29af15a011c2c233b
Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'

* commit '7763118cae4eb468b032dbd29af15a011c2c233b':
  log: Support for 256color terminals

Conflicts:
doc/APIchanges
libavutil/log.c
libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
libavutil/log.c
libavutil/log.h
libavutil/version.h