X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fstream_output%2Fstream_output.c;h=a6672dede5784847466da56805d9bda44a0beec1;hb=14f37b2101842fa6e427f962f689db74eff6faba;hp=2726a3510ce32cc54e2af8e92abaa240c84f9e24;hpb=dbdbe005f7569a0986f9416ae924e35b045ad9a1;p=vlc diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 2726a3510c..a6672dede5 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -47,6 +47,8 @@ #include "input/input_interface.h" +#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' ) + #undef DEBUG_BUFFER /***************************************************************************** * Local prototypes @@ -211,7 +213,7 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, msg_Dbg( p_sout, "adding a new sout input (sout_input:%p)", p_input ); - if( p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_fmt->i_codec == VLC_CODEC_NULL ) { vlc_object_release( p_sout ); return p_input; @@ -240,7 +242,7 @@ int sout_InputDelete( sout_packetizer_input_t *p_input ) msg_Dbg( p_sout, "removing a sout input (sout_input:%p)", p_input ); - if( p_input->p_fmt->i_codec != VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_input->p_fmt->i_codec != VLC_CODEC_NULL ) { vlc_mutex_lock( &p_sout->lock ); p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id ); @@ -261,7 +263,7 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input, sout_instance_t *p_sout = p_input->p_sout; int i_ret; - if( p_input->p_fmt->i_codec == VLC_FOURCC( 'n', 'u', 'l', 'l' ) ) + if( p_input->p_fmt->i_codec == VLC_CODEC_NULL ) { block_Release( p_buffer ); return VLC_SUCCESS; @@ -300,8 +302,6 @@ sout_access_out_t *sout_AccessOutNew( vlc_object_t *p_sout, psz_next = config_ChainCreate( &p_access->psz_access, &p_access->p_cfg, psz_access ); free( psz_next ); - if( !p_access->psz_access ) - p_access->psz_access = strdup( "" ); p_access->psz_path = strdup( psz_name ? psz_name : "" ); p_access->p_sys = NULL; p_access->pf_seek = NULL;