X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fmux%2Fdummy.c;h=51e11adaa2b2f243ebc53002b31d446da9e7e3c8;hb=3894020366b7b15c865b382dc74fbda6da192a05;hp=6db2dcf05af6cece77c149cbb737c51721edf2c8;hpb=25ad0cdef1cfe031218aae58017a5124335f55d0;p=vlc

diff --git a/modules/mux/dummy.c b/modules/mux/dummy.c
index 6db2dcf05a..51e11adaa2 100644
--- a/modules/mux/dummy.c
+++ b/modules/mux/dummy.c
@@ -30,7 +30,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_sout.h>
 #include <vlc_block.h>
 
@@ -40,16 +41,16 @@
 static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
-vlc_module_begin();
-    set_description( _("Dummy/Raw muxer") );
-    set_capability( "sout mux", 5 );
-    set_category( CAT_SOUT );
-    set_subcategory( SUBCAT_SOUT_MUX );
-    add_shortcut( "dummy" );
-    add_shortcut( "raw" );
-    add_shortcut( "es" );
-    set_callbacks( Open, Close );
-vlc_module_end();
+vlc_module_begin ()
+    set_description( N_("Dummy/Raw muxer") )
+    set_capability( "sout mux", 5 )
+    set_category( CAT_SOUT )
+    set_subcategory( SUBCAT_SOUT_MUX )
+    add_shortcut( "dummy" )
+    add_shortcut( "raw" )
+    add_shortcut( "es" )
+    set_callbacks( Open, Close )
+vlc_module_end ()
 
 /*****************************************************************************
  * Exported prototypes
@@ -63,7 +64,7 @@ struct sout_mux_sys_t
 {
     /* Some streams have special initialization data, we'll output this
      * data as an header in the stream. */
-    vlc_bool_t b_header;
+    bool b_header;
 };
 
 /*****************************************************************************
@@ -83,7 +84,9 @@ static int Open( vlc_object_t *p_this )
     p_mux->pf_mux       = Mux;
 
     p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) );
-    p_sys->b_header      = VLC_TRUE;
+    if( !p_sys )
+        return VLC_ENOMEM;
+    p_sys->b_header      = true;
 
     return VLC_SUCCESS;
 }
@@ -104,18 +107,18 @@ static void Close( vlc_object_t * p_this )
 static int Control( sout_mux_t *p_mux, int i_query, va_list args )
 {
     VLC_UNUSED(p_mux);
-    vlc_bool_t *pb_bool;
+    bool *pb_bool;
 
     switch( i_query )
     {
         case MUX_CAN_ADD_STREAM_WHILE_MUXING:
-            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
-            *pb_bool = VLC_TRUE;
+            pb_bool = (bool*)va_arg( args, bool * );
+            *pb_bool = true;
             return VLC_SUCCESS;
 
         case MUX_GET_ADD_STREAM_WAIT:
-            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
-            *pb_bool = VLC_FALSE;
+            pb_bool = (bool*)va_arg( args, bool * );
+            *pb_bool = false;
             return VLC_SUCCESS;
 
         case MUX_GET_MIME:   /* Unknown */
@@ -172,7 +175,7 @@ static int Mux( sout_mux_t *p_mux )
             i_count--;
         }
     }
-    p_sys->b_header = VLC_FALSE;
+    p_sys->b_header = false;
 
     return VLC_SUCCESS;
 }