835f41376d
* commit 'd15c536123a44362ace6299c391a492c90b83fc7': doc: Point to the correct, actually maintained gas-preprocessor repo Conflicts: doc/platform.texi 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.