Copyright stuff

diff --git a/modules/access_output/shout.c b/modules/access_output/shout.c
index 40e76f7ba6dbc5bda95285cd13141f090c7d1fac..995de3c6dce7a5bd1a91259c36f54b4d80443dac 100644 (file)
--- a/modules/access_output/shout.c
+++ b/modules/access_output/shout.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * shout.c: This module forwards vorbis streams to an icecast server
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Daniel Fischer <dan at subsignal dot org>

diff --git a/modules/codec/ffmpeg/mux.c b/modules/codec/ffmpeg/mux.c
index 7a948593eee224e52922b57c53f2c4fbd239d412..eed1c2c0174f8d608e4d4ce03ef519e4b44cf015 100644 (file)
--- a/modules/codec/ffmpeg/mux.c
+++ b/modules/codec/ffmpeg/mux.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * mux.c: muxer using ffmpeg (libavformat).
  *****************************************************************************
- * Copyright (C) 2006 VideoLAN
+ * Copyright (C) 2006 the VideoLAN team
  * $Id: demux.c 8444 2004-08-17 08:21:07Z gbazin $
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>

diff --git a/modules/demux/playlist/xspf.c b/modules/demux/playlist/xspf.c
index f097476fcd4772a156dd1d16b976fe65df697022..94adbd73099bba01c8a39f212df6cbf7fe3a0d1c 100644 (file)
--- a/modules/demux/playlist/xspf.c
+++ b/modules/demux/playlist/xspf.c
@@ -117,9 +117,7 @@ int Demux( demux_t *p_demux )
         xml_ReaderDelete( p_xml, p_xml_reader );
     if( p_xml )
         xml_Delete( p_xml );
-
-    return i_ret;
-    return 0;
+    return VLC_SUCCESS;
 }
 
 /** \brief dummy function for demux callback interface */
@@ -176,7 +174,7 @@ static vlc_bool_t parse_playlist_node COMPLEX_INTERFACE
         }
         /* attribute: version */
         if( !strcmp( psz_name, "version" ) )
-       {
+        {
             b_version_found = VLC_TRUE;
             if( strcmp( psz_value, "0" ) && strcmp( psz_value, "1" ) )
                 msg_Warn( p_demux, "unsupported XSPF version" );

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 37fa347abf9675c2a31846d302d004980a1f4587..e5e611f8f650bfe737ef087a392d9a18d53518e7 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ts.c: Transport Stream input module for VLC.
  *****************************************************************************
- * Copyright (C) 2004-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2004-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>

diff --git a/modules/gui/skins2/commands/cmd_playtree.cpp b/modules/gui/skins2/commands/cmd_playtree.cpp
index 68aac7d977b1852244428114039f67d53064767f..4f94b4257c06b29d81305b6fe77feb1f3e867785 100644 (file)
--- a/modules/gui/skins2/commands/cmd_playtree.cpp
+++ b/modules/gui/skins2/commands/cmd_playtree.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * cmd_playtree.cpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/commands/cmd_playtree.hpp b/modules/gui/skins2/commands/cmd_playtree.hpp
index 2afb795cedc468d71ef3274b0a6658399f9cacdf..3309174295f7c6e413a0d98ffea8f485e94bceb1 100644 (file)
--- a/modules/gui/skins2/commands/cmd_playtree.hpp
+++ b/modules/gui/skins2/commands/cmd_playtree.hpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * cmd_playtree.hpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/controls/ctrl_tree.cpp b/modules/gui/skins2/controls/ctrl_tree.cpp
index 66ea7a60fd8da486a78bb12a14f7a5bc457f1836..0c27d34d6312fde6cac0a071c2191558aef67df3 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.cpp
+++ b/modules/gui/skins2/controls/ctrl_tree.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * ctrl_tree.cpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/controls/ctrl_tree.hpp b/modules/gui/skins2/controls/ctrl_tree.hpp
index da3ccd785ba5ecdddc2cc2325e5cf31aa5b8b7be..59d7d3e07aaf0c652dcf4d0b76240dcc4795edaa 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_tree.hpp
+++ b/modules/gui/skins2/controls/ctrl_tree.hpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * ctrl_tree.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
+ * Copyright (C) 2003 the VideoLAN team
  * $Id$
  *
- * Authors: Antoine Cellerier
+ * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/utils/var_tree.cpp b/modules/gui/skins2/utils/var_tree.cpp
index 7be52339be25513626d84d09a90167dcd049a020..a7454e5847514b80de34051248d59f022b358526 100644 (file)
--- a/modules/gui/skins2/utils/var_tree.cpp
+++ b/modules/gui/skins2/utils/var_tree.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * var_tree.cpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/utils/var_tree.hpp b/modules/gui/skins2/utils/var_tree.hpp
index a343662069c9f35ce7735c858508a15c7e46c8b1..ad269bbdfecc20e112de304b29970788214850dc 100644 (file)
--- a/modules/gui/skins2/utils/var_tree.hpp
+++ b/modules/gui/skins2/utils/var_tree.hpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * var_tree.hpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/vars/playtree.cpp b/modules/gui/skins2/vars/playtree.cpp
index c0bda1cd5a02f2220d3e76f30d9cf16e8a47070f..07fe03aeb397bf76b01f8ad63a39e6a8086a6f48 100644 (file)
--- a/modules/gui/skins2/vars/playtree.cpp
+++ b/modules/gui/skins2/vars/playtree.cpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * playtree.cpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/gui/skins2/vars/playtree.hpp b/modules/gui/skins2/vars/playtree.hpp
index 3fcf12d8e3731a048c43771c4ccf3f887b614ba3..5812c5988dbcb075ecd7a1bdff00fd868f5956d6 100644 (file)
--- a/modules/gui/skins2/vars/playtree.hpp
+++ b/modules/gui/skins2/vars/playtree.hpp
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * playtree.hpp
  *****************************************************************************
- * Copyright (C) 2005 VideoLAN
+ * Copyright (C) 2005 the VideoLAN team
  * $Id$
  *
  * Authors: Antoine Cellerier <dionoea@videolan.org>
+ *          Clément Stenac <zorglub@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 48320bf2a74375f7460ec32973bde4452e09da91..b1699038847ccb4dbecad7eb45f2843b00dffb5d 100644 (file)
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ts.c: MPEG-II TS Muxer
  *****************************************************************************
- * Copyright (C) 2001-2005 VideoLAN (Centrale Réseaux) and its contributors
+ * Copyright (C) 2001-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>