license/copyright change

Originally committed as revision 585 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-05-25 22:23:19 +00:00
parent a1b63811c3
commit 17048ca88f
1 changed files with 5 additions and 8 deletions

13
README
View File

@ -1,5 +1,3 @@
FFmpeg - (c) 2000,2001 Gerard Lantau.
1) Introduction 1) Introduction
--------------- ---------------
@ -61,13 +59,12 @@ ffmpeg is made of two programs:
3) Licensing: 3) Licensing:
------------ ------------
* See the file COPYING. ffmpeg and the associated library are licensed * See the file COPYING. ffmpeg and the associated library EXCEPT
under the GNU General Public License. I may change the license of liba52 are licensed under the Lesser GNU General Public
libavcodec and libav to LGPL if many people ask it (and if they License. liba52 is distributed under the GNU General Public License.
submit good patches!).
* This code should be patent free since it is very simple. I took care * 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 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.