b967c10029
* commit '39dc4a6bb34baf833ce1e5eabad7d0dbf933237d': x86: dca: Add missing multiple inclusion guards gitignore: Add all examples below doc/examples arm: Mark the stack as non-executable doxygen: Replace @parblock syntax with manual linebreaks doxygen: Add a number of missing function parameter descriptions Conflicts: .gitignore libavformat/avformat.h All changes are already in our 2.2 branch, this is just for metadata 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.