[FFmpeg-cvslog] Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'
Michael Niedermayer
git at videolan.org
Fri Apr 4 02:15:15 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 4 02:08:24 2014 +0200| [a692ff93ef5ba90e07c3fdecf05359bdca9b9066] | committer: Michael Niedermayer
Merge commit '9464b69da6b373d1eeb6b3d269ad029d9647b498'
* commit '9464b69da6b373d1eeb6b3d269ad029d9647b498':
log: Unbreak windows support
Conflicts:
libavutil/log.c
No change as we didnt use print_256color() in our implementation
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a692ff93ef5ba90e07c3fdecf05359bdca9b9066
---
More information about the ffmpeg-cvslog
mailing list