Michael Niedermayer
a692ff93ef
* 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@gmx.at>
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.