102397d2c1
* commit '16c22122c788b5e54a2f2e224bd0106429f0714c': h264: K&R formatting cosmetics Conflicts: libavcodec/h264.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.