# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_input.h>
#include <vlc_sout.h>
#include <vlc_interface.h>
vlc_module_begin();
set_shortname( "ES" );
- set_description( _("Elementary stream output") );
+ set_description( N_("Elementary stream output") );
set_capability( "sout stream", 50 );
add_shortcut( "es" );
set_category( CAT_SOUT );
/*****************************************************************************
* Exported prototypes
*****************************************************************************/
-static const char *ppsz_sout_options[] = {
+static const char *const ppsz_sout_options[] = {
"access", "access-audio", "access-video",
"mux", "mux-audio", "mux-video",
"dst", "dst-audio", "dst-video",
}
p = psz_dst = malloc( 4096 );
+ if( !psz_dst )
+ return NULL;
memset( p, 0, 4096 );
for( ;; )
{
}
id = malloc( sizeof( sout_stream_id_t ) );
+ if( !id )
+ {
+ sout_MuxDelete( p_mux );
+ sout_AccessOutDelete( p_access );
+ return NULL;
+ }
id->p_mux = p_mux;
id->p_input = sout_MuxAddStream( p_mux, p_fmt );
if( id->p_input == NULL )
{
- free( id );
-
sout_MuxDelete( p_mux );
sout_AccessOutDelete( p_access );
free( id );