summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-21 13:38:19 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-09-21 13:38:19 +0000
commitaa708721f918489d9e0946efbd28a1e1d2fb0343 (patch)
treeee559cde9528b52d0c2e1ae7db5a3cc612c4e43f
parenta1c64fc0561175e7ce77ff536bc921f8f56a407c (diff)
downloadmpv-aa708721f918489d9e0946efbd28a1e1d2fb0343.tar.bz2
mpv-aa708721f918489d9e0946efbd28a1e1d2fb0343.tar.xz
clarification about FFmpeg license, typo
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13422 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--Copyright5
1 files changed, 3 insertions, 2 deletions
diff --git a/Copyright b/Copyright
index e7a2465d6f..e570607c8d 100644
--- a/Copyright
+++ b/Copyright
@@ -12,7 +12,8 @@ Name: FFmpeg
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 @@ Directory: unrarlib.[ch]
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