r78 - videolan/vlc/debian

[zorglub at alioth.debian.org]

Author: zorglub
Date: 2006-09-09 09:05:02 +0000 (Sat, 09 Sep 2006)
New Revision: 78

Modified:
   videolan/vlc/debian/copyright
Log:
Resync copyrights


Modified: videolan/vlc/debian/copyright
===================================================================
--- videolan/vlc/debian/copyright	2006-09-06 20:46:05 UTC (rev 77)
+++ videolan/vlc/debian/copyright	2006-09-09 09:05:02 UTC (rev 78)
@@ -38,44 +38,51 @@
 * Some parts of the charset handling routines (src/misc/charset.c) are Copyright (C) 2001-2003 The Mape Project
 * The XSPF playlist handling code (modules/demux/playlist/xspf and modules/misc/playlist/xspf) is Copyright (C) 2006 Daniel Stränger <vlc at schmaller dot de>
 * Some parts of the TY demux (modules/demux/ty.c) are Copyright (C) 2005 by Neal Symms (tivo at freakinzoo.com) - February 2005
-* The VLC tables for transrating are Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved. 
+* The VLC tables for transrating are Copyright (C) 1996, MPEG Software Simulation Group. All Rights Reserved.
 * Some parts of the transrating module (modules/stream_out/transrate) are Copyright (C) 2003 Antoine Missout, Copyright (C) 2000-2003 Michel Lespinasse <walken at zoy.org>, Copyright (C) 1999-2000 Aaron Holtzman <aholtzma at ess.engr.uvic.ca>
 * The Unzip library used in skins2 (modules/gui/skins2/unzip) is Copyright (C) 1998-2005 Gilles Vollant and Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
 * The GnuTLS module (module/misc/gnutls.c) is Copyright (C) 2004-2006 Rémi Denis-Courmont
 * The Xtag XML parser (modules/misc/xml/xtag*) is Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research
 * The Real RTSP access plugin (modules/access/rtsp) is Copyright (C) 2002-2003 the xine project and Copyright (C) 2002-2004 the xine project
+* The mono converter (modules/audio_filter/converter/mono.c) is Copyright (C) 2006 M2X
 * The DV access module (modules/access/dv.c) is Copyright (C) 2005 M2X and Copyright by Arne Schirmacher <dvgrab at schirmacher.de>
 * The VCDx input module (modules/access/vcdx/) is Copyright (C) 2003, 2004 Rocky Bernstein <rocky at panix.com>
 * Some parts of the V4L input module (modules/access/v4l/videodev_mjpeg.h) are Copyright (C) lavrec (see http://mjpeg.sourceforge.net)
+* Some parts of the FFMPEG encoder is Copyright (C) FFMPEG Project Developers
+* Some parts of the FTP input module (modules/access/ftp.c) are Copyright © 2006 Rémi Denis-Courmont
 * Some parts of the DVB input module (modules/access/dvb/en50221.c) are Copyright (C) 2000 Klaus Schmidinger
+* The XA and VOC demuxers are Copyright (C) 2005 Rémi Denis-Courmont
 * The RTCP handling routines (modules/mux/rtp/rtcp, modules/mux/rtp/rtp.h) are Copyright (C) 2005 M2X
 * Some parts of the TS muxer (modules/mux/mpeg/csa*) are Copyright (C) 2004-2005 Laurent Aimar and Copyright (C) 2004 Laurent Aimar
 * The Swscale module is Copyright (C) 1999, Aaron Holtzman <aholtzma at ess.engr.uvic.ca>, Copyright (C) 2001-2003 Michael Niedermayer <michaelni at gmx.at>,  Copyright (C) 2004 Romain Dolbeau <romain at dolbeau.org>, Copyright (C) 2000, Håkan Hjort <d95hjort at dtek.chalmers.se> and opyright (C) 2000, Silicon Integrated System Corp.
 * The CMML decoder (modules/codec/cmml) is Copyright (C) 2003-2004 Commonwealth Scientific and Industrial Research
 * The DVB subtitles decoder (modules/codec/dvbsub.c) is Copyright (C) 2003 ANEVIA
 * Some MMX routines (include/mmx.h) are Copyright (C) 1997-1999 H. Dietz and R. Fisher
-* The binary loader is Copyright       1994    Eric Youndale & Erik Bos, Copyright       1995    Martin von Löwis, Copyright   1996-98 Marcus Meissner, Copyright 1995 Thomas Sandford, Copyright 1993 Robert J. Amstadt, Copyright 1995 Alexandre Julliard, Copyright 2000 Eugene Kuznetsov (divx at euro.ru)
+* The binary loader is Copyright 1994 Eric Youndale & Erik Bos, Copyright 1995-1996 Martin von Löwis, Copyright 1996-98 Marcus Meissner, Copyright 1995 Thomas Sandford, Copyright 1993 Robert J. Amstadt, Copyright 1995 Alexandre Julliard, Copyright 2000 Eugene Kuznetsov (divx at euro.ru), Copyright (C) 1998 Patrick Stridvall, Copyright (C) 1999 Eric Pouech, Copyright (C) 1993-1994 Martin Ayotte.
 * The atof testsuite (src/test/i18n_atof.c) is Copyright (C) 2006 Rémi Denis-Courmont
 * Faad2 (extras/faad2) is  Copyright (C) 2003-2005 M. Bakker, Ahead Software AG, http://www.nero.com
+* The custom line edit widget in modules/gui/qt4/util/customwidgets is Copyright (C) 2004 Daniel Molkentin <molkentin at kde.org>
+* The AppleRemote code in modules/gui/macosx is Copyright (c) 2006 martinkahr.com. All rights reserved.and released under
+  a MIT-style license.
 * The MPEG4IP plugin for Faad2 (extras/faad2/plugins/mpeg4ip) is Copyright (C) 2003 Bill May wmay at cisco.com
+* The XMMS plugin for Faad2 (extras/faad2/plugins/xmms) is copyrighted by Frederic Fondriest (2002-2004).
 * X264 (extras/x264) is Copyright (C) 2003 Laurent Aimar, Copyright (C) 2005 Loren Merritt, Copyright (C) 2003 x264 project, Copyright (c) 2002 Michael Niedermayer <michaelni at gmx.at>, Copyright (c) 2000 The NetBSD Foundation, Inc., Copyright 2005 Laurent Aimar, Justin Clay, Min Chen, Eric Petit, Måns Rullgård, Loren Merritt
 * The default skin (share/skins2/default) is Copyright (C) 2006 aLtgLass and the font is Copyright (C) 1994-1996 Jos Buivenga.
  The skin is released under Creative Commons Deeds Attribution-ShareAlike 2.5 UK:Scotland
      You are free:
-     
-         * to copy, distribute, display, and perform the work
-         * to make derivative works
-         * to make commercial use of the work
-     
+        * to copy, distribute, display, and perform the work
+        * to make derivative works
+        * to make commercial use of the work
      Under the following conditions:
-     * Attribution. You must attribute the work in the manner specified by the author or licensor.
-     * Share Alike. If you alter, transform, or build upon this work, you may distribute the resulting work only under a license identical to this one.
-     
-         * For any reuse or distribution, you must make clear to others the license terms of this work.
-         * Any of these conditions can be waived if you get permission from the copyright holder.
+     	* Attribution. You must attribute the work in the manner specified by
+	  the author or licensor.
+	* Share Alike. If you alter, transform, or build upon this work, you may
+	  distribute the resulting work only under a license identical to this one.
+        * For any reuse or distribution, you must make clear to others the license
+	  terms of this work.
+        * Any of these conditions can be waived if you get permission from the
+	  copyright holder.
 
 
-
-
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL'.