X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.h;h=1607927847606e0ce44f71de15451756ba32e199;hb=ee66aa20dfb5349774ba1a79c27d579fd62f78f7;hp=0952966112b821b74ef30fb604f30e1662583f57;hpb=da0a29883736b514db54bfd9479b6335d0957dc8;p=vlc

diff --git a/src/stream_output/stream_output.h b/src/stream_output/stream_output.h
index 0952966112..1607927847 100644
--- a/src/stream_output/stream_output.h
+++ b/src/stream_output/stream_output.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * stream_output.h : internal stream output
  *****************************************************************************
- * Copyright (C) 2002-2005 the VideoLAN team
+ * Copyright (C) 2002-2005 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -9,19 +9,19 @@
  *          Eric Petit <titer@videolan.org>
  *          Jean-Paul Saman <jpsaman #_at_# m2x.nl>
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  ***************************************************************************/
 
 #ifndef VLC_SRC_STREAMOUT_H
@@ -42,8 +42,8 @@ struct sout_packetizer_input_t
     sout_stream_id_t    *id;
 };
 
-#define sout_NewInstance(a,b) __sout_NewInstance(VLC_OBJECT(a),b)
-sout_instance_t *  __sout_NewInstance( vlc_object_t *, const char * );
+sout_instance_t *sout_NewInstance( vlc_object_t *, const char * );
+#define sout_NewInstance(a,b) sout_NewInstance(VLC_OBJECT(a),b)
 void sout_DeleteInstance( sout_instance_t * );
 
 sout_packetizer_input_t *sout_InputNew( sout_instance_t *, es_format_t * );