X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Fes.c;h=e0736aa3f374708985c6b061efb8dece99dd25a1;hb=dab63839ecf1fe7884dbfac21a38a80e6d51ebe0;hp=8b0bbc4cf10c38d03acb881a876364d7ea62c6ea;hpb=e40d134c69b144327fd1d2001e8b85640f5c7cb9;p=vlc diff --git a/modules/stream_out/es.c b/modules/stream_out/es.c index 8b0bbc4cf1..e0736aa3f3 100644 --- a/modules/stream_out/es.c +++ b/modules/stream_out/es.c @@ -25,6 +25,10 @@ * Preamble *****************************************************************************/ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #include #include #include @@ -93,10 +97,13 @@ vlc_module_begin(); add_string( SOUT_CFG_PREFIX "dst", "", NULL, DEST_TEXT, DEST_LONGTEXT, VLC_TRUE ); + change_unsafe(); add_string( SOUT_CFG_PREFIX "dst-audio", "", NULL, DESTA_TEXT, DESTA_LONGTEXT, VLC_TRUE ); + change_unsafe(); add_string( SOUT_CFG_PREFIX "dst-video", "", NULL, DESTV_TEXT, DESTV_LONGTEXT, VLC_TRUE ); + change_unsafe(); set_callbacks( Open, Close ); vlc_module_end(); @@ -359,10 +366,10 @@ 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, - _("Streaming / Transcoding failed"), - _("There is no suitable stream-output access module for \"%s/%s://%s\"."), - psz_access, + intf_UserFatal( p_stream, VLC_FALSE, + _("Streaming / Transcoding failed"), + _("There is no suitable stream-output access module for \"%s/%s://%s\"."), + psz_access, psz_mux, psz_dst ); return( NULL ); } @@ -373,10 +380,10 @@ 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, - _("Streaming / Transcoding failed"), + intf_UserFatal( p_stream, VLC_FALSE, + _("Streaming / Transcoding failed"), _("There is no suitable stream-output access module "\ - "for \"%s/%s://%s\"."), + "for \"%s/%s://%s\"."), psz_access, psz_mux, psz_dst ); sout_AccessOutDelete( p_access ); return( NULL ); @@ -401,6 +408,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 ); @@ -413,6 +421,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;