mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
56e682374e
* commit 'b85dbe68e222586fd77332716eb8ed5724db4e1b': avconv: Call exit_program instead of exit in avconv_opt as well Conflicts: ffmpeg_opt.c See: eeddeb6579d8133871dc15f989ab8ffec5b5b396 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.