vlc | branch: master | Francois Cartegnie <[email protected]> | Fri Jul 7 15:46:54 2017 +0200| [d43163e4b5b5a3451989fc3594ff3cb37a269b8f] | committer: Francois Cartegnie
sout: remove NULL fourcc stuff and decref seems there since sout = object_find() was removed > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d43163e4b5b5a3451989fc3594ff3cb37a269b8f --- src/stream_output/stream_output.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/src/stream_output/stream_output.c b/src/stream_output/stream_output.c index 2910420464..87f3c7b794 100644 --- a/src/stream_output/stream_output.c +++ b/src/stream_output/stream_output.c @@ -50,8 +50,6 @@ #include "input/input_interface.h" -#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' ) - #undef DEBUG_BUFFER /***************************************************************************** * Local prototypes @@ -169,12 +167,6 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, msg_Dbg( p_sout, "adding a new sout input (sout_input: %p)", (void *)p_input ); - if( p_fmt->i_codec == VLC_CODEC_NULL ) - { - vlc_object_release( p_sout ); - return p_input; - } - /* *** add it to the stream chain */ vlc_mutex_lock( &p_sout->lock ); p_input->id = p_sout->p_stream->pf_add( p_sout->p_stream, p_fmt ); @@ -199,7 +191,7 @@ int sout_InputDelete( sout_packetizer_input_t *p_input ) msg_Dbg( p_sout, "removing a sout input (sout_input: %p)", (void *)p_input ); - if( p_input->p_fmt->i_codec != VLC_CODEC_NULL ) + if( p_input->id ) { vlc_mutex_lock( &p_sout->lock ); p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id ); @@ -241,7 +233,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_CODEC_NULL ) + if( p_input->id == NULL ) { block_Release( p_buffer ); return VLC_SUCCESS; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
