sout: voidify sout_stream_t.pf_del

This is always VLC_SUCCESS, or a forwarded value. Ultimately, the
value was (rightfully) ignored by the stream output core.

diff --git a/include/vlc_sout.h b/include/vlc_sout.h
index ba6d0a416eca8d32b16721617a9fe0501942ebb6..ce0f654a1372eb2f8eb496bb299c8412f1a50d02 100644 (file)
--- a/include/vlc_sout.h
+++ b/include/vlc_sout.h
@@ -187,7 +187,7 @@ struct sout_stream_t
 
     /* add, remove a stream */
     sout_stream_id_sys_t *(*pf_add)( sout_stream_t *, es_format_t * );
-    int               (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * );
+    void              (*pf_del)( sout_stream_t *, sout_stream_id_sys_t * );
     /* manage a packet */
     int               (*pf_send)( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
@@ -203,9 +203,9 @@ static inline sout_stream_id_sys_t *sout_StreamIdAdd( sout_stream_t *s, es_forma
 {
     return s->pf_add( s, fmt );
 }
-static inline int sout_StreamIdDel( sout_stream_t *s, sout_stream_id_sys_t *id )
+static inline void sout_StreamIdDel( sout_stream_t *s, sout_stream_id_sys_t *id )
 {
-    return s->pf_del( s, id );
+    s->pf_del( s, id );
 }
 static inline int sout_StreamIdSend( sout_stream_t *s, sout_stream_id_sys_t *id, block_t *b )
 {

diff --git a/modules/stream_out/autodel.c b/modules/stream_out/autodel.c
index 734f91c5331dec573b57e6bc5e1c1da60cae11b6..3ee560d8173c87afd9c21b4ef9b2fb05b7a0a561 100644 (file)
--- a/modules/stream_out/autodel.c
+++ b/modules/stream_out/autodel.c
@@ -55,7 +55,7 @@ vlc_module_end ()
  * Local prototypes
  *****************************************************************************/
 static sout_stream_id_sys_t *Add   ( sout_stream_t *, es_format_t * );
-static int               Del   ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del   ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send  ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 struct sout_stream_id_sys_t
@@ -125,7 +125,7 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return p_es;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *p_es )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *p_es )
 {
     sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
     sout_stream_id_sys_t *id = p_es->id;
@@ -134,9 +134,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *p_es )
     free( p_es );
 
     if ( id != NULL )
-        return p_stream->p_next->pf_del( p_stream->p_next, id );
-    else
-        return VLC_SUCCESS;
+        p_stream->p_next->pf_del( p_stream->p_next, id );
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *p_es,

diff --git a/modules/stream_out/bridge.c b/modules/stream_out/bridge.c
index c63e94f4c9c263f7e81a4f6ac88791d25307286f..3999bae94a60c13262e0e2f12cc241554b2bf4dc 100644 (file)
--- a/modules/stream_out/bridge.c
+++ b/modules/stream_out/bridge.c
@@ -141,11 +141,11 @@ static const char *const ppsz_sout_options_in[] = {
 };
 
 static sout_stream_id_sys_t *AddOut ( sout_stream_t *, es_format_t * );
-static int               DelOut ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              DelOut ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               SendOut( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 static sout_stream_id_sys_t *AddIn ( sout_stream_t *, es_format_t * );
-static int               DelIn ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              DelIn ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               SendIn( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 typedef struct bridged_es_t
@@ -295,16 +295,14 @@ static sout_stream_id_sys_t * AddOut( sout_stream_t *p_stream, es_format_t *p_fm
     return (sout_stream_id_sys_t *)p_sys;
 }
 
-static int DelOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void DelOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     VLC_UNUSED(id);
     out_sout_stream_sys_t *p_sys = (out_sout_stream_sys_t *)p_stream->p_sys;
     bridged_es_t *p_es;
 
     if ( !p_sys->b_inited )
-    {
-        return VLC_SUCCESS;
-    }
+        return;
 
     vlc_mutex_lock( &lock );
 
@@ -318,8 +316,6 @@ static int DelOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     vlc_mutex_unlock( &lock );
 
     p_sys->b_inited = false;
-
-    return VLC_SUCCESS;
 }
 
 static int SendOut( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
@@ -490,17 +486,15 @@ static sout_stream_id_sys_t * AddIn( sout_stream_t *p_stream, es_format_t *p_fmt
     return id;
 }
 
-static int DelIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void DelIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     in_sout_stream_sys_t *p_sys = (in_sout_stream_sys_t *)p_stream->p_sys;
 
     if( id == p_sys->id_video ) p_sys->id_video = NULL;
     if( id == p_sys->id_audio ) p_sys->id_audio = NULL;
 
-    int ret = p_stream->p_next->pf_del( p_stream->p_next, id->id );
-
+    p_stream->p_next->pf_del( p_stream->p_next, id->id );
     free( id );
-    return ret;
 }
 
 static int SendIn( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/chromaprint.c b/modules/stream_out/chromaprint.c
index 4a9cad68892bb23f651ec5360617ff19b302068d..fc9e2fea5af7b43561affa88d766e92e742a6f98 100644 (file)
--- a/modules/stream_out/chromaprint.c
+++ b/modules/stream_out/chromaprint.c
@@ -48,7 +48,7 @@ static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 /*****************************************************************************
@@ -200,14 +200,13 @@ error:
     return NULL;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     Finish( p_stream );
     if ( p_sys->id == id ) /* not assuming only 1 id is in use.. */
         p_sys->id = NULL;
     free( id );
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/chromecast/cast.cpp b/modules/stream_out/chromecast/cast.cpp
index af5cc3a213769280732725e738eb1a0176c59394..94e7fab8049249c9769770318baa74a15d230906 100644 (file)
--- a/modules/stream_out/chromecast/cast.cpp
+++ b/modules/stream_out/chromecast/cast.cpp
@@ -182,10 +182,11 @@ static sout_stream_id_sys_t *Add(sout_stream_t *p_stream, es_format_t *p_fmt)
 }
 
 
-static int Del(sout_stream_t *p_stream, sout_stream_id_sys_t *id)
+static void Del(sout_stream_t *p_stream, sout_stream_id_sys_t *id)
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
-    return p_sys->p_out->pf_del(p_sys->p_out, id);
+
+    p_sys->p_out->pf_del(p_sys->p_out, id);
 }
 
 

diff --git a/modules/stream_out/cycle.c b/modules/stream_out/cycle.c
index fb501ae403a0a127239177fdb8f12c225d9d1624..51537d1420e07103a063af0e69f2620daa2c8b25 100644 (file)
--- a/modules/stream_out/cycle.c
+++ b/modules/stream_out/cycle.c
@@ -96,7 +96,7 @@ static sout_stream_id_sys_t *Add(sout_stream_t *stream, es_format_t *fmt)
     return id;
 }
 
-static int Del(sout_stream_t *stream, sout_stream_id_sys_t *id)
+static void Del(sout_stream_t *stream, sout_stream_id_sys_t *id)
 {
     sout_stream_sys_t *sys = stream->p_sys;
 
@@ -115,7 +115,6 @@ static int Del(sout_stream_t *stream, sout_stream_id_sys_t *id)
 
     es_format_Clean(&id->fmt);
     free(id);
-    return VLC_SUCCESS;
 }
 
 static int AddStream(sout_stream_t *stream, char *chain)

diff --git a/modules/stream_out/delay.c b/modules/stream_out/delay.c
index ec5d10f2707adff0c34f8edd04d7e9503db77229..5f1c4f1f8392d1862ea0e8f96879e83cd265772e 100644 (file)
--- a/modules/stream_out/delay.c
+++ b/modules/stream_out/delay.c
@@ -73,7 +73,7 @@ static const char *ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add   ( sout_stream_t *, es_format_t * );
-static int               Del   ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del   ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send  ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 struct sout_stream_sys_t
@@ -143,14 +143,14 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *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_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
 
     if ( id == p_sys->id )
         p_sys->id = NULL;
 
-    return p_stream->p_next->pf_del( p_stream->p_next, id );
+    p_stream->p_next->pf_del( p_stream->p_next, id );
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/description.c b/modules/stream_out/description.c
index ac2642212861ea3dd9411d1e85b9794cabe7be4c..847bc648bc75e325a07af505ee07aa94bd385d5f 100644 (file)
--- a/modules/stream_out/description.c
+++ b/modules/stream_out/description.c
@@ -44,7 +44,7 @@ static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 /*****************************************************************************
@@ -123,12 +123,11 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return (void *)p_fmt_copy;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     msg_Dbg( p_stream, "Removing a stream" );
     /* NOTE: id should be freed by the input manager, not here. */
     (void) id;
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/display.c b/modules/stream_out/display.c
index db2d3b061879a899e8c998d664f198ea523c4245..c332a232516ac09af86f8c5414ff54a63e49beed 100644 (file)
--- a/modules/stream_out/display.c
+++ b/modules/stream_out/display.c
@@ -75,7 +75,7 @@ static const char *const ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 struct sout_stream_sys_t
@@ -157,11 +157,10 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return (sout_stream_id_sys_t *)p_dec;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     (void) p_stream;
     input_DecoderDelete( (decoder_t *)id );
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/dummy.c b/modules/stream_out/dummy.c
index 5142757ff0e893b73f0f0f8cfcaa16499e790184..fee71ec5d6d1d89a3dfc946913659ba9f4b3d762 100644 (file)
--- a/modules/stream_out/dummy.c
+++ b/modules/stream_out/dummy.c
@@ -41,7 +41,7 @@ static int      Open    ( vlc_object_t * );
 static void     Close   ( vlc_object_t * );
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 /*****************************************************************************
@@ -84,12 +84,10 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return malloc( 1 );
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     VLC_UNUSED(p_stream);
     free( id );
-
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index ce55e08a96dcc1007e968b720584c4eb28a1f10b..9957fbface1ded045611e51147af58c5d99e7f8a 100644 (file)
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -54,7 +54,7 @@ vlc_module_end ()
  * Exported prototypes
  *****************************************************************************/
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *,
                                block_t* );
 
@@ -239,7 +239,7 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 /*****************************************************************************
  * Del:
  *****************************************************************************/
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
     int               i_stream;
@@ -255,7 +255,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 
     free( id->pp_ids );
     free( id );
-    return VLC_SUCCESS;
 }
 
 /*****************************************************************************

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index c4b6274a29b3ffb17cf254d2013c18246e073c1b..14a0165d7ea11122c400a529dea2d4e77363e27a 100644 (file)
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -120,7 +120,7 @@ static const char *const ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 struct sout_stream_sys_t
@@ -408,7 +408,7 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return id;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     VLC_UNUSED(p_stream);
     sout_access_out_t *p_access = id->p_mux->p_access;
@@ -420,7 +420,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     sout_AccessOutDelete( p_access );
 
     free( id );
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c
index 3f5e186c4159225fdff7a3e30744e7c5443f8019..6d9dcb60802931e198bb1c6ce9de6468ee064897 100644 (file)
--- a/modules/stream_out/gather.c
+++ b/modules/stream_out/gather.c
@@ -52,7 +52,7 @@ vlc_module_end ()
  * Exported prototypes
  *****************************************************************************/
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 struct sout_stream_id_sys_t
@@ -197,11 +197,10 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 /*****************************************************************************
  * Del:
  *****************************************************************************/
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     VLC_UNUSED(p_stream);
     id->b_used = false;
-    return VLC_SUCCESS;
 }
 
 /*****************************************************************************

diff --git a/modules/stream_out/langfromtelx.c b/modules/stream_out/langfromtelx.c
index 3a32b28e88fc2130408228bdd90f33e9a8029931..a24c16fd91446284991dc8c5472f104a4cd44745 100644 (file)
--- a/modules/stream_out/langfromtelx.c
+++ b/modules/stream_out/langfromtelx.c
@@ -85,7 +85,7 @@ static const char *ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add   ( sout_stream_t *, es_format_t * );
-static int               Del   ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del   ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send  ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 struct sout_stream_sys_t
@@ -173,14 +173,14 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *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_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
 
     if ( id == p_sys->p_id ) p_sys->p_id = NULL;
     if ( id == p_sys->p_telx ) p_sys->p_telx = NULL;
 
-    return p_stream->p_next->pf_del( p_stream->p_next, id );
+    p_stream->p_next->pf_del( p_stream->p_next, id );
 }
 
 static void SetLanguage( sout_stream_t *p_stream, char *psz_language )

diff --git a/modules/stream_out/mosaic_bridge.c b/modules/stream_out/mosaic_bridge.c
index 005929a7150acfc5df5d1f86f5917ce10ea4253f..034c6b5408d168ab29eb7ecc32b4cdb5187a719e 100644 (file)
--- a/modules/stream_out/mosaic_bridge.c
+++ b/modules/stream_out/mosaic_bridge.c
@@ -74,7 +74,7 @@ struct decoder_owner_sys_t
 static int  Open    ( vlc_object_t * );
 static void Close   ( vlc_object_t * );
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 inline static int video_update_format_decoder( decoder_t *p_dec );
@@ -409,7 +409,7 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return (sout_stream_id_sys_t *)p_sys;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     VLC_UNUSED(id);
     sout_stream_sys_t *p_sys = p_stream->p_sys;
@@ -419,7 +419,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     int i;
 
     if( !p_sys->b_inited )
-        return VLC_SUCCESS;
+        return;
 
     if( p_sys->p_decoder != NULL )
     {
@@ -479,8 +479,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     }
 
     p_sys->b_inited = false;
-
-    return VLC_SUCCESS;
 }
 
 /*****************************************************************************

diff --git a/modules/stream_out/raop.c b/modules/stream_out/raop.c
index 8960475ef4797cd6d43d52b8140fb82d1d62b0a7..2260773b759e8ffc7c22917b194610be31651436 100644 (file)
--- a/modules/stream_out/raop.c
+++ b/modules/stream_out/raop.c
@@ -82,7 +82,7 @@ static int Open( vlc_object_t * );
 static void Close( vlc_object_t * );
 
 static sout_stream_id_sys_t *Add( sout_stream_t *, es_format_t * );
-static int Del( sout_stream_t *, sout_stream_id_sys_t * );
+static void Del( sout_stream_t *, sout_stream_id_sys_t * );
 static int Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 static int VolumeCallback( vlc_object_t *p_this, char const *psz_cmd,
@@ -1621,17 +1621,14 @@ error:
 /*****************************************************************************
  * Del:
  *****************************************************************************/
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
-    int i_err = VLC_SUCCESS;
 
     if ( p_sys->p_audio_stream == id )
         p_sys->p_audio_stream = NULL;
 
     FreeId( id );
-
-    return i_err;
 }
 
 

diff --git a/modules/stream_out/record.c b/modules/stream_out/record.c
index 926e5a92c6701f3da6cfce8d2a511ab28342ad2f..27147328ada3ea7186907f913b3fdcd610a5cec3 100644 (file)
--- a/modules/stream_out/record.c
+++ b/modules/stream_out/record.c
@@ -76,7 +76,7 @@ static const char *const ppsz_sout_options[] = {
 
 /* */
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 /* */
@@ -201,7 +201,7 @@ static sout_stream_id_sys_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return id;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
@@ -226,8 +226,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     }
 
     free( id );
-
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/rtp.c b/modules/stream_out/rtp.c
index 949a1616c5f139177cf88126b404f3fe11f936fb..0d0e5e61fc0b64705cd3d2295c5de3a5dbfae161 100644 (file)
--- a/modules/stream_out/rtp.c
+++ b/modules/stream_out/rtp.c
@@ -274,11 +274,11 @@ static const char *const ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *,
                                block_t* );
 static sout_stream_id_sys_t *MuxAdd ( sout_stream_t *, es_format_t * );
-static int               MuxDel ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              MuxDel ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               MuxSend( sout_stream_t *, sout_stream_id_sys_t *,
                                   block_t* );
 
@@ -1217,7 +1217,7 @@ error:
     return NULL;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
@@ -1260,7 +1260,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     if( p_sys->psz_sdp_file != NULL ) FileSetup( p_stream );
 
     free( id );
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
@@ -1705,13 +1704,12 @@ static int MuxSend( sout_stream_t *p_stream, sout_stream_id_sys_t *id,
 
 
 /** Remove an ES from a non-RTP muxed stream */
-static int MuxDel( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void MuxDel( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_mux_t *p_mux = p_stream->p_sys->p_mux;
     assert( p_mux != NULL );
 
     sout_MuxDeleteStream( p_mux, (sout_input_t *)id );
-    return VLC_SUCCESS;
 }
 
 

diff --git a/modules/stream_out/setid.c b/modules/stream_out/setid.c
index 481483ecff72bd783278e01ad1c417a6d1ee00c6..1e8fae4031f530f13b76d0b739848696692e6e6f 100644 (file)
--- a/modules/stream_out/setid.c
+++ b/modules/stream_out/setid.c
@@ -97,7 +97,7 @@ static const char *ppsz_sout_options_lang[] = {
 
 static sout_stream_id_sys_t *AddId   ( sout_stream_t *, es_format_t * );
 static sout_stream_id_sys_t *AddLang ( sout_stream_t *, es_format_t * );
-static int               Del     ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del     ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send    ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 struct sout_stream_sys_t
@@ -214,9 +214,9 @@ static sout_stream_id_sys_t * AddLang( sout_stream_t *p_stream, es_format_t *p_f
     return p_stream->p_next->pf_add( p_stream->p_next, p_fmt );
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
-    return p_stream->p_next->pf_del( p_stream->p_next, id );
+    p_stream->p_next->pf_del( p_stream->p_next, id );
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/smem.c b/modules/stream_out/smem.c
index 791f9f86aa20e2d080cdcf0b7d047c40f9f41a23..7bf9755419a46ce6fb4a0e54ceb8342e367bda35 100644 (file)
--- a/modules/stream_out/smem.c
+++ b/modules/stream_out/smem.c
@@ -126,7 +126,7 @@ static const char *const ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 static sout_stream_id_sys_t *AddVideo( sout_stream_t *p_stream, es_format_t *p_fmt );
@@ -291,11 +291,10 @@ static sout_stream_id_sys_t *AddAudio( sout_stream_t *p_stream, es_format_t *p_f
     return id;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     VLC_UNUSED( p_stream );
     free( id );
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/standard.c b/modules/stream_out/standard.c
index 4ba5dfa8eab5e0b843a4b9d2255119fd8b6b024f..5b8ce1023bb466d884dd0abf517fdecf028a925c 100644 (file)
--- a/modules/stream_out/standard.c
+++ b/modules/stream_out/standard.c
@@ -133,10 +133,9 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return (sout_stream_id_sys_t*)sout_MuxAddStream( p_stream->p_sys->p_mux, p_fmt );
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_MuxDeleteStream( p_stream->p_sys->p_mux, (sout_input_t*)id );
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/stats.c b/modules/stream_out/stats.c
index 4bd80129ab604538bf90912eec1c1cbcdc605c29..996f1eca1aa55beae80f87f5d273baa26f024dab 100644 (file)
--- a/modules/stream_out/stats.c
+++ b/modules/stream_out/stats.c
@@ -68,7 +68,7 @@ static const char *ppsz_sout_options[] = {
 };
 
 static sout_stream_id_sys_t *Add   ( sout_stream_t *, es_format_t * );
-static int               Del   ( sout_stream_t *, sout_stream_id_sys_t * );
+static void               Del   ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send  ( sout_stream_t *, sout_stream_id_sys_t *, block_t * );
 
 struct sout_stream_sys_t
@@ -187,7 +187,7 @@ static sout_stream_id_sys_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     return id;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = (sout_stream_sys_t *)p_stream->p_sys;
 
@@ -207,8 +207,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
     free( outputhash );
     if( id->next_id ) sout_StreamIdDel( p_stream->p_next, id->next_id );
     free( id );
-
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,

diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index 4bd72c28c92bef94845dbb3b401d1fb0fd1e5d3d..95f7635a81641345367a3823a4c29cf06515df02 100644 (file)
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -234,7 +234,7 @@ static const char *const ppsz_sout_options[] = {
  * Exported prototypes
  *****************************************************************************/
 static sout_stream_id_sys_t *Add ( sout_stream_t *, es_format_t * );
-static int               Del ( sout_stream_t *, sout_stream_id_sys_t * );
+static void              Del ( sout_stream_t *, sout_stream_id_sys_t * );
 static int               Send( sout_stream_t *, sout_stream_id_sys_t *, block_t* );
 
 /*****************************************************************************
@@ -588,7 +588,7 @@ error:
     return NULL;
 }
 
-static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
+static void Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
 {
     sout_stream_sys_t *p_sys = p_stream->p_sys;
 
@@ -628,8 +628,6 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_sys_t *id )
         id->p_encoder = NULL;
     }
     free( id );
-
-    return VLC_SUCCESS;
 }
 
 static int Send( sout_stream_t *p_stream, sout_stream_id_sys_t *id,