a13af77f49
* commit '21015109ec0fac0f104a5355f272ecb956ba3f4e': doc: Document the flv demuxer Conflicts: doc/demuxers.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.