Michael Niedermayer
b7a5f5dc66
* commit 'a36947c167d7278b891453083b57dc56b7a7f5c5': dsputilenc_mmx: K&R formatting cosmetics Conflicts: libavcodec/x86/dsputilenc_mmx.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.