From aa708721f918489d9e0946efbd28a1e1d2fb0343 Mon Sep 17 00:00:00 2001
From: diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 21 Sep 2004 13:38:19 +0000
Subject: [PATCH] clarification about FFmpeg license, typo

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13422 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 Copyright | 5 +++--
 1 file 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