mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
69a6eddd60
* commit 'f2960097e42ddf9a356bab6547f87906f6999e0a': bink: fix a check for the first frame. doc/developer: Drop obsolete MPlayer reference doc/developer: Add ISC license to list of acceptable licenses doc/developer: Add web links for all suggested licenses Conflicts: doc/developer.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.