Commit 506ba466 authored by Laurent Aimar's avatar Laurent Aimar

Cosmetics.

parent f05f6fee
...@@ -47,6 +47,8 @@ ...@@ -47,6 +47,8 @@
#include "input/input_interface.h" #include "input/input_interface.h"
#define VLC_CODEC_NULL VLC_FOURCC( 'n', 'u', 'l', 'l' )
#undef DEBUG_BUFFER #undef DEBUG_BUFFER
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
...@@ -211,7 +213,7 @@ sout_packetizer_input_t *sout_InputNew( sout_instance_t *p_sout, ...@@ -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 ); 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 ); vlc_object_release( p_sout );
return p_input; return p_input;
...@@ -240,7 +242,7 @@ int sout_InputDelete( sout_packetizer_input_t *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 ); 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 ); vlc_mutex_lock( &p_sout->lock );
p_sout->p_stream->pf_del( p_sout->p_stream, p_input->id ); 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, ...@@ -261,7 +263,7 @@ int sout_InputSendBuffer( sout_packetizer_input_t *p_input,
sout_instance_t *p_sout = p_input->p_sout; sout_instance_t *p_sout = p_input->p_sout;
int i_ret; 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 ); block_Release( p_buffer );
return VLC_SUCCESS; return VLC_SUCCESS;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment