aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2007-08-13 22:17:29 +0000
committerDiego Biurrun <diego@biurrun.de>2007-08-13 22:17:29 +0000
commita92b819a2d9e097d3c3f3fc756e6c8f0a5152b53 (patch)
tree38503f96ae02d92137c9f5ca7cbafb425dab3111
parente1669c5ebe775c81d4b5e6abf8d03a9e86d1c5a8 (diff)
downloadffmpeg-a92b819a2d9e097d3c3f3fc756e6c8f0a5152b53.tar.gz
Clarify LGPL and GPL licensing of FFmpeg.
Originally committed as revision 10109 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--README9
1 files changed, 4 insertions, 5 deletions
diff --git a/README b/README
index 9f905357e6..ebb3629180 100644
--- a/README
+++ b/README
@@ -9,11 +9,10 @@ FFmpeg README
2) Licensing
------------
-* Read the file COPYING. ffmpeg and the associated libraries EXCEPT
- libpostproc and libswscale are licensed under the GNU Lesser General
+* Read the file COPYING.LGPL. FFmpeg and the associated libraries EXCEPT
+ for libpostproc and libswscale are licensed under the GNU Lesser General
Public License.
* libpostproc and libswscale are distributed under the GNU General Public
- License and their compilation and use is optional in ffmpeg.
-
-Fabrice Bellard.
+ License, see the file COPYING.GPL for details. Their compilation and use
+ in FFmpeg is optional.