mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-01-24 13:56:33 +02:00
31dfe20dd2
* qatar/master: doc: Replace some @file tags by more suitable markup. fate: Set FUZZ factor of vorbis-13 test to 2. fate: Set FUZZ factor of (e)ac3-encode test to 3. fate: remove unused code from regressions-funcs.sh rtmp: Don't assume path points to a string of nonzero length avconv: fix behavior with -ss as an output option. Conflicts: doc/platform.texi doc/protocols.texi ffmpeg.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.