mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-29 22:00:58 +02:00
0d487654ea
* commit 'fe568b3d27ca2c5cca3878b2a7a3a968e605aec4': http: Improve options descriptions Conflicts: doc/protocols.texi libavformat/http.c See: 255ec768da6f6e821775888621da2156764598da See: 0a7cd740438b46e3b9fbf406ca5a948a6f027c97 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.