eb2244ece9
* commit '4015829accc2382393d42d62654eb96d896d1326': bit_depth_template: Use file name as multiple inclusion guard svq3: Adjust #endif comment hevc: Mention the missing SPS in the error message doc: Name the MOV muxer as it should be called doc: Sort the muxer documentation Conflicts: doc/muxers.texi 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.