- Added FFMPEG to binary-LICENSE.txt plus new programmers to license.

git-svn-id: https://svn.tribler.org/abc/branches/jelle/guiVWX_3.6@3858 001aeff7-3401-0410-a489-f7902fc005dd
Tribler · May 8, 2007 · 8b97d5e · 8b97d5e
1 parent a7ac3ab
commit 8b97d5e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -114,8 +114,8 @@ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFT
 ------------------------------------------------------------------------------
 
 All code written by Jie Yang, Pawel Garbacki, Jun Wang, Arno Bakker,
-Jan David Mol, Qin Chen, Yuan Yuan, Jelle Roozenburg has the following 
-license:
+Jan David Mol, Qin Chen, Yuan Yuan, Jelle Roozenburg, Freek Zindel,
+Fabian van der Werf has the following license:
 
  TRIBLER file-sharing library.
 

diff --git a/binary-LICENSE.txt b/binary-LICENSE.txt
@@ -338,6 +338,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  code and/or adjust the licensing conditions notice accordingly.
 
 ------------------------------VideoLAN Client---------------------------------
+
  GNU GENERAL PUBLIC LICENSE
  Version 2, June 1991
 
@@ -680,13 +681,27 @@ library. If this is what you want to do, use the GNU Library General
 Public License instead of this License.
 
 
-------------------------------Tribler-----------------------------------------
+-------------------------------FFMPEG-----------------------------------------
+
+FFMPEG Licensing
+----------------
+
+* Read the file COPYING. ffmpeg and the associated libraries EXCEPT
+ liba52 and libpostproc are licensed under the Lesser GNU General
+ Public License.
 
+* liba52 and libpostproc are distributed under the GNU General Public
+ License and their compilation and use is optional in ffmpeg.
+
+Fabrice Bellard.
+
+
+------------------------------Tribler-----------------------------------------
 
 
 All code written by Jie Yang, Pawel Garbacki, Jun Wang, Arno Bakker,
-Jan David Mol, Qin Chen, Yuan Yuan, Jelle Roozenburg has the following 
-license:
+Jan David Mol, Qin Chen, Yuan Yuan, Jelle Roozenburg, Freek Zindel,
+Fabian van der Werf has the following license:
 
  TRIBLER file-sharing library.
 

diff --git a/debian/copyright b/debian/copyright
@@ -114,8 +114,8 @@ STICHTING MATHEMATISCH CENTRUM DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFT
 ------------------------------------------------------------------------------
 
 All code written by Jie Yang, Pawel Garbacki, Jun Wang, Arno Bakker,
-Jan David Mol, Qin Chen, Yuan Yuan, Jelle Roozenburg has the following 
-license:
+Jan David Mol, Qin Chen, Yuan Yuan, Jelle Roozenburg, Freek Zindel,
+Fabian van der Werf has the following license:
 
  TRIBLER file-sharing library.