[Mplayer-cvslog] CVS: main Copyright,1.12,1.13

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv2340

Modified Files:
	Copyright 
Log Message:
clarification about FFmpeg license, typo


Index: Copyright
===================================================================
RCS file: /cvsroot/mplayer/main/Copyright,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- Copyright	20 Sep 2004 14:26:57 -0000	1.12
+++ Copyright	21 Sep 2004 13:38:19 -0000	1.13
@@ -12,7 +12,8 @@
 Version:    CVS snapshot
 Homepage:   http://www.ffmpeg.org
 Directory:  libavcodec, libavformat
-License:    GNU Lesser General Public License
+License:    GNU Lesser General Public License, some parts GNU General Public
+            License, GNU General Public License when combined
 
 Name:       FAAD2
 Version:    2.0 + portability patches
@@ -99,7 +100,7 @@
 License:    GNU General Public License / UniquE RAR File Library License
 
 Name:       uCIFS library
-Version:    Development files as of september 2004
+Version:    development files as of september 2004
 Homepage:   http://ubiqx.org/libcifs/
 Directory:  libvo/md5sum.[ch]
 License:    GNU Lesser General Public License