e727cbf0be
* commit 'f859fed03d5d039430baea03a0ef35cfd6ac4abd': http: Always allow no-op seek 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.