X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fsetid.c;h=e7c5915154d98284631c6f94b87fd3d3592fd4f4;hb=3e0fad2e7fda45074f4d817f858cf0e7a42ec1ee;hp=f2e23ae99add02319e9d44d6f098403d3dc74e49;hpb=c495c265de8ee928e99fb78a61ff1161be126e94;p=vlc

diff --git a/modules/stream_out/setid.c b/modules/stream_out/setid.c
index f2e23ae99a..e7c5915154 100644
--- a/modules/stream_out/setid.c
+++ b/modules/stream_out/setid.c
@@ -1,23 +1,23 @@
 /*****************************************************************************
  * setid.c: set ID/lang on a stream
  *****************************************************************************
- * Copyright (C) 2009-2011 VideoLAN and AUTHORS
+ * Copyright © 2009-2011 VLC authors and VideoLAN
  *
  * Authors: Christophe Massiot <massiot@via.ecp.fr>
  *
- * 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.
+ * 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., 59 Temple Place - Suite 330, Boston, MA  02111, 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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -102,7 +102,6 @@ static int               Send    ( sout_stream_t *, sout_stream_id_t *, block_t
 
 struct sout_stream_sys_t
 {
-    sout_stream_t    *p_out;
     int              i_id;
     int              i_new_id;
     char             *psz_language;
@@ -197,7 +196,7 @@ static sout_stream_id_t * AddId( sout_stream_t *p_stream, es_format_t *p_fmt )
         p_fmt->i_id = p_sys->i_new_id;
     }
 
-    return p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+    return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
 }
 
 static sout_stream_id_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt )
@@ -212,20 +211,16 @@ static sout_stream_id_t * AddLang( sout_stream_t *p_stream, es_format_t *p_fmt )
         p_fmt->psz_language = strdup( p_sys->psz_language );
     }
 
-    return p_sys->p_out->pf_add( p_sys->p_out, p_fmt );
+    return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
 }
 
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
-    sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
-
-    return p_sys->p_out->pf_del( p_sys->p_out, id );
+    return p_stream->p_next->pf_del( p_stream->p_next, id );
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
                  block_t *p_buffer )
 {
-    sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
-
-    return p_sys->p_out->pf_send( p_sys->p_out, id, p_buffer );
+    return p_stream->p_next->pf_send( p_stream->p_next, id, p_buffer );
 }