summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorFabrice Bellard <fabrice@bellard.org>2002-05-25 22:23:19 +0000
committerFabrice Bellard <fabrice@bellard.org>2002-05-25 22:23:19 +0000
commit17048ca88fc100c6a19cfd5248ea5b87469fb2c3 (patch)
tree47bf6be1068047378f6e39949041ae773772c308 /README
parenta1b63811c310ff036278ca971a4cc18356c94925 (diff)
downloadffmpeg-17048ca88fc100c6a19cfd5248ea5b87469fb2c3.tar.gz
license/copyright change
Originally committed as revision 585 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'README')
-rw-r--r--README13
1 files changed, 5 insertions, 8 deletions
diff --git a/README b/README
index 4ae288ece9..9144a32728 100644
--- a/README
+++ b/README
@@ -1,5 +1,3 @@
-FFmpeg - (c) 2000,2001 Gerard Lantau.
-
1) Introduction
---------------
@@ -61,13 +59,12 @@ ffmpeg is made of two programs:
3) Licensing:
------------
-* See the file COPYING. ffmpeg and the associated library are licensed
- under the GNU General Public License. I may change the license of
- libavcodec and libav to LGPL if many people ask it (and if they
- submit good patches!).
+* See the file COPYING. ffmpeg and the associated library EXCEPT
+ liba52 are licensed under the Lesser GNU General Public
+ License. liba52 is distributed under the GNU General Public License.
* This code should be patent free since it is very simple. I took care
to use the same video encoder/decoder core for all formats to show
- that they really ARE THE SAME except for the encoding huffman codes.
+ that they really are mostly the same.
-Gerard Lantau (glantau@yahoo.fr).
+Fabrice Bellard. \ No newline at end of file