[FFmpeg-cvslog] Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'
Michael Niedermayer
git at videolan.org
Thu Apr 3 20:53:00 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 3 20:40:33 2014 +0200| [c16e00618122a7f1217f5174a6c4013eb57421b0] | committer: Michael Niedermayer
Merge commit '7763118cae4eb468b032dbd29af15a011c2c233b'
* commit '7763118cae4eb468b032dbd29af15a011c2c233b':
log: Support for 256color terminals
Conflicts:
doc/APIchanges
libavutil/log.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c16e00618122a7f1217f5174a6c4013eb57421b0
---
More information about the ffmpeg-cvslog
mailing list