*****************************************************************************/
#include <errno.h> /* ENOMEM */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <vlc/vlc.h>
#include <vlc_sout.h>
#include <vlc_block.h>
inline static void video_del_buffer_decoder( decoder_t *, picture_t * );
inline static void video_del_buffer_filter( filter_t *, picture_t * );
-static void video_del_buffer( vlc_object_t *, picture_t * );
+static void video_del_buffer( picture_t * );
inline static picture_t *video_new_buffer_decoder( decoder_t * );
inline static picture_t *video_new_buffer_filter( filter_t * );
{
msg_Err( p_stream, "cannot find decoder" );
vlc_object_detach( p_sys->p_decoder );
- vlc_object_destroy( p_sys->p_decoder );
+ vlc_object_release( p_sys->p_decoder );
return NULL;
}
"no video filter matching name \"%s\" found",
psz_name );
vlc_object_detach( *pp_vfilter );
- vlc_object_destroy( *pp_vfilter );
+ vlc_object_release( *pp_vfilter );
p_sys->i_vfilters--;
}
}
static int Del( sout_stream_t *p_stream, sout_stream_id_t *id )
{
+ VLC_UNUSED(id);
sout_stream_sys_t *p_sys = p_stream->p_sys;
bridge_t *p_bridge;
bridged_es_t *p_es;
if( p_sys->p_decoder->p_module )
module_Unneed( p_sys->p_decoder, p_sys->p_decoder->p_module );
vlc_object_detach( p_sys->p_decoder );
- vlc_object_destroy( p_sys->p_decoder );
+ vlc_object_release( p_sys->p_decoder );
for( i = 0; i < PICTURE_RING_SIZE; i++ )
{
vlc_object_detach( *pp_vfilter );
if( (*pp_vfilter)->p_module )
module_Unneed( *pp_vfilter, (*pp_vfilter)->p_module );
- vlc_object_destroy( *pp_vfilter );
+ vlc_object_release( *pp_vfilter );
}
free( p_sys->pp_vfilters );
}
p_pic = malloc( sizeof(picture_t) );
+ if( !p_pic ) return NULL;
fmt_out->video.i_chroma = fmt_out->i_codec;
vout_AllocatePicture( p_this, p_pic,
fmt_out->video.i_chroma,
inline static void video_del_buffer_decoder( decoder_t *p_this,
picture_t *p_pic )
{
- video_del_buffer( VLC_OBJECT( p_this ), p_pic );
+ VLC_UNUSED(p_this);
+ video_del_buffer( p_pic );
}
inline static void video_del_buffer_filter( filter_t *p_this,
picture_t *p_pic )
{
- video_del_buffer( VLC_OBJECT( p_this ), p_pic );
+ VLC_UNUSED(p_this);
+ video_del_buffer( p_pic );
}
-static void video_del_buffer( vlc_object_t *p_this, picture_t *p_pic )
+static void video_del_buffer( picture_t *p_pic )
{
p_pic->i_refcount = 0;
p_pic->i_status = DESTROYED_PICTURE;
static void video_link_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
+ VLC_UNUSED(p_dec);
p_pic->i_refcount++;
}
static void video_unlink_picture_decoder( decoder_t *p_dec, picture_t *p_pic )
{
+ VLC_UNUSED(p_dec);
video_release_buffer_decoder( p_pic );
}
vlc_value_t oldval, vlc_value_t newval,
void *p_data )
{
+ VLC_UNUSED(p_this); VLC_UNUSED(oldval);
sout_stream_t *p_stream = (sout_stream_t *)p_data;
sout_stream_sys_t *p_sys = p_stream->p_sys;
int i_ret = VLC_SUCCESS;