mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2025-02-20 12:14:04 +00:00
70a25587d2
* commit '67f2a688143b644f99360565a9f36c61a5f052e9': avconv: remove a write-only variable Conflicts: ffmpeg.c ffmpeg.h 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.