4cd066b69c
* commit '21732063a346475eb22c332b27e8216b79f9ad4a': movenc: K&R formatting cosmetics Conflicts: libavformat/movenc.c 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.