Merge branch 'master' of git@git.videolan.org:vlc

[vlc] / modules / stream_out / gather.c

diff --git a/modules/stream_out/gather.c b/modules/stream_out/gather.c
index 7c11b46a4d0e16148d8c86bc89de3fb65804169b..d8507eda2ae2a8df5c00ff927ac23d5c81a5a9e0 100644 (file)
--- a/modules/stream_out/gather.c
+++ b/modules/stream_out/gather.c
@@ -25,6 +25,10 @@
  * Preamble
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>
@@ -51,7 +55,7 @@ static int               Send( sout_stream_t *, sout_stream_id_t *, block_t* );
 
 struct sout_stream_id_t
 {
-    vlc_bool_t    b_used;
+    bool    b_used;
 
     es_format_t fmt;
     void          *id;
@@ -152,7 +156,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
 
         /* */
         msg_Dbg( p_stream, "reusing already opened output" );
-        id->b_used = VLC_TRUE;
+        id->b_used = true;
         return id;
     }
 
@@ -177,7 +181,7 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     if( id == NULL )
         return NULL;
     es_format_Copy( &id->fmt, p_fmt );
-    id->b_used           = VLC_TRUE;
+    id->b_used           = true;
     id->id               = sout_StreamIdAdd( p_sys->p_out, &id->fmt );
     if( id->id == NULL )
     {
@@ -194,7 +198,8 @@ static sout_stream_id_t * Add( sout_stream_t *p_stream, es_format_t *p_fmt )
  *****************************************************************************/
 static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 {
-    id->b_used = VLC_FALSE;
+    VLC_UNUSED(p_stream);
+    id->b_used = false;
     return VLC_SUCCESS;
 }