bcc6429c01
* commit '40de74d0eb8c1898e2184a1484fe246aed5b295d': http: Export Content-Type information Conflicts: doc/protocols.texi libavformat/http.c 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.