9ae2aaea50
* commit 'cd874cf8e69f1b31986fd978577994b45efa3d5c': http: Allow setting a Content-Type for POST requests Conflicts: 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.