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

[vlc] / modules / stream_out / duplicate.c

diff --git a/modules/stream_out/duplicate.c b/modules/stream_out/duplicate.c
index 5040a24ddf703ea0257beb3815e8097bf2153e0b..cea28c329b9d696b442f49201f86d35b78ebe1d2 100644 (file)
--- a/modules/stream_out/duplicate.c
+++ b/modules/stream_out/duplicate.c
@@ -24,8 +24,10 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
-#include <stdlib.h>
-#include <string.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
 
 #include <vlc/vlc.h>
 #include <vlc_sout.h>
@@ -71,7 +73,7 @@ struct sout_stream_id_t
     void                **pp_ids;
 };
 
-static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select );
+static bool ESSelected( es_format_t *fmt, char *psz_select );
 
 /*****************************************************************************
  * Open:
@@ -148,19 +150,10 @@ static void Close( vlc_object_t * p_this )
     for( i = 0; i < p_sys->i_nb_streams; i++ )
     {
         sout_StreamDelete( p_sys->pp_streams[i] );
-        if( p_sys->ppsz_select[i] )
-        {
-            free( p_sys->ppsz_select[i] );
-        }
-    }
-    if( p_sys->pp_streams )
-    {
-        free( p_sys->pp_streams );
-    }
-    if( p_sys->ppsz_select )
-    {
-        free( p_sys->ppsz_select );
+        free( p_sys->ppsz_select[i] );
     }
+    free( p_sys->pp_streams );
+    free( p_sys->ppsz_select );
 
     free( p_sys );
 }
@@ -291,7 +284,7 @@ static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
 /*****************************************************************************
  * Divers
  *****************************************************************************/
-static vlc_bool_t NumInRange( char *psz_range, int i_num )
+static bool NumInRange( char *psz_range, int i_num )
 {
     char *psz = strchr( psz_range, '-' );
     char *end;
@@ -310,10 +303,10 @@ static vlc_bool_t NumInRange( char *psz_range, int i_num )
         i_start = i_stop = strtol( psz_range, NULL, 0 );
     }
 
-    return i_start <= i_num && i_num <= i_stop ? VLC_TRUE : VLC_FALSE;
+    return i_start <= i_num && i_num <= i_stop ? true : false;
 }
 
-static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
+static bool ESSelected( es_format_t *fmt, char *psz_select )
 {
     char  *psz_dup;
     char  *psz;
@@ -326,7 +319,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
     /* If empty all es are selected */
     if( psz_select == NULL || *psz_select == '\0' )
     {
-        return VLC_TRUE;
+        return true;
     }
     psz_dup = strdup( psz_select );
     psz     = psz_dup;
@@ -452,7 +445,7 @@ static vlc_bool_t ESSelected( es_format_t *fmt, char *psz_select )
 
     if( i_cat == 1 || i_es == 1 || i_prgm == 1 )
     {
-        return VLC_TRUE;
+        return true;
     }
-    return VLC_FALSE;
+    return false;
 }