diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:02:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-17 17:26:45 +0100 |
| commit | c0b1bc8d1797355c4f65ae4c488705b98cf9c8e9 (patch) | |
| tree | eae6aa5ce1c9c4304cddc7607dba11bc784ca6fb /LICENSE | |
| parent | e528cdac8a95a5364cdd408412b64dc605a8eba6 (diff) | |
| download | ffmpeg-c0b1bc8d1797355c4f65ae4c488705b98cf9c8e9.tar.gz | |
Revert "partially rename FFmpeg to Libav"
This reverts commit 070c5d0f3530c16c92b81f3f0de2943410367c00.
Diffstat (limited to 'LICENSE')
| -rw-r--r-- | LICENSE | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -1,17 +1,17 @@ -Libav: +FFmpeg: ------- -Most files in Libav are under the GNU Lesser General Public License version 2.1 +Most files in FFmpeg are under the GNU Lesser General Public License version 2.1 or later (LGPL v2.1+). Read the file COPYING.LGPLv2.1 for details. Some other files have MIT/X11/BSD-style licenses. In combination the LGPL v2.1+ applies to -Libav. +FFmpeg. -Some optional parts of Libav are licensed under the GNU General Public License +Some optional parts of FFmpeg are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to -configure to activate them. In this case, Libav's license changes to GPL v2+. +configure to activate them. In this case, FFmpeg's license changes to GPL v2+. -Specifically, the GPL parts of Libav are +Specifically, the GPL parts of FFmpeg are - libpostproc - optional x86 optimizations in the files @@ -33,14 +33,14 @@ external libraries: ------------------- Some external libraries, e.g. libx264, are under GPL and can be used in -conjunction with Libav. They require --enable-gpl to be passed to configure +conjunction with FFmpeg. They require --enable-gpl to be passed to configure as well. The OpenCORE external libraries are under the Apache License 2.0. That license is incompatible with the LGPL v2.1 and the GPL v2, but not with version 3 of -those licenses. So to combine the OpenCORE libraries with Libav, the license +those licenses. So to combine the OpenCORE libraries with FFmpeg, the license version needs to be upgraded by passing --enable-version3 to configure. -The nonfree external library libfaac can be hooked up in Libav. You need to +The nonfree external library libfaac can be hooked up in FFmpeg. You need to pass --enable-nonfree to configure to enable it. Employ this option with care -as Libav then becomes nonfree and unredistributable. +as FFmpeg then becomes nonfree and unredistributable. |