Include vlc_plugin.h as needed

[vlc] / modules / stream_out / es.c

diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c
index 222bfa33a73848ad235933c5187ab3c83ea3052b..63c444f6f31c9b775f582894a8e0deb7fb30ad14 100644 (file)
--- a/modules/stream_out/es.c
+++ b/modules/stream_out/es.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_sout.h>
 #include <vlc_interface.h>
@@ -82,27 +83,27 @@ vlc_module_begin();
     set_subcategory( SUBCAT_SOUT_STREAM );
 
     add_string( SOUT_CFG_PREFIX "access", "", NULL, ACCESS_TEXT,
-                ACCESS_LONGTEXT, VLC_TRUE );
+                ACCESS_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "access-audio", "", NULL, ACCESSA_TEXT,
-                ACCESSA_LONGTEXT, VLC_TRUE );
+                ACCESSA_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "access-video", "", NULL, ACCESSV_TEXT,
-                ACCESSV_LONGTEXT, VLC_TRUE );
+                ACCESSV_LONGTEXT, true );
 
     add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
-                MUX_LONGTEXT, VLC_TRUE );
+                MUX_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux-audio", "", NULL, MUXA_TEXT,
-                MUXA_LONGTEXT, VLC_TRUE );
+                MUXA_LONGTEXT, true );
     add_string( SOUT_CFG_PREFIX "mux-video", "", NULL, MUXV_TEXT,
-                MUXV_LONGTEXT, VLC_TRUE );
+                MUXV_LONGTEXT, true );
 
     add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT,
-                DEST_LONGTEXT, VLC_TRUE );
+                DEST_LONGTEXT, true );
         change_unsafe();
     add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT,
-                DESTA_LONGTEXT, VLC_TRUE );
+                DESTA_LONGTEXT, true );
         change_unsafe();
     add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT,
-                DESTV_LONGTEXT, VLC_TRUE );
+                DESTV_LONGTEXT, true );
         change_unsafe();
 
     set_callbacks( Open, Close );
@@ -366,7 +367,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     {
         msg_Err( p_stream, "no suitable sout access module for `%s/%s://%s'",
                  psz_access, psz_mux, psz_dst );
-        intf_UserFatal( p_stream, VLC_FALSE,
+        intf_UserFatal( p_stream, false,
                     _("Streaming / Transcoding failed"),
                     _("There is no suitable stream-output access module for \"%s/%s://%s\"."),
                           psz_access,
@@ -380,7 +381,7 @@ static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
     {
         msg_Err( p_stream, "no suitable sout mux module for `%s/%s://%s'",
                  psz_access, psz_mux, psz_dst );
-        intf_UserFatal( p_stream, VLC_FALSE,
+        intf_UserFatal( p_stream, false,
                         _("Streaming / Transcoding failed"),
                         _("There is no suitable stream-output access module "\
                           "for \"%s/%s://%s\"."),
@@ -408,6 +409,7 @@ 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 )
 {
+    VLC_UNUSED(p_stream);
     sout_access_out_t *p_access = id->p_mux->p_access;
     sout_MuxDelete( id->p_mux );
     sout_MuxDeleteStream( id->p_mux, id->p_input );
@@ -420,6 +422,7 @@ static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
 static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
                  block_t *p_buffer )
 {
+    VLC_UNUSED(p_stream);
     sout_MuxSendBuffer( id->p_mux, id->p_input, p_buffer );
 
     return VLC_SUCCESS;