# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_vout.h>
#include "filter_common.h"
#define CFG_PREFIX "clone-"
vlc_module_begin();
- set_description( _("Clone video filter") );
+ set_description( N_("Clone video filter") );
set_capability( "video filter", 0 );
- set_shortname( _("Clone" ));
+ set_shortname( N_("Clone" ));
set_category( CAT_VIDEO );
set_subcategory( SUBCAT_VIDEO_VFILTER );
set_callbacks( Create, Destroy );
vlc_module_end();
-static const char *ppsz_filter_options[] = {
+static const char *const ppsz_filter_options[] = {
"count", "vout-list", NULL
};
/* Allocate structure */
p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL )
- {
- msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
- }
p_vout->pf_init = Init;
p_vout->pf_end = End;
vout_CreatePicture( p_vout->p_sys->pp_vout[ i_vout ], 0, 0, 0 )
) == NULL )
{
- if( p_vout->b_die || p_vout->b_error )
+ if( !vlc_object_alive (p_vout) || p_vout->b_error )
{
vout_DestroyPicture(
p_vout->p_sys->pp_vout[ i_vout ], p_outpic );
if( i_in_pitch == i_copy_pitch
&& i_out_pitch == i_copy_pitch )
{
- p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_in_pitch
+ vlc_memcpy( p_out, p_in, i_in_pitch
* p_outpic->p[i_plane].i_visible_lines );
}
else
while( p_in < p_in_end )
{
- p_vout->p_libvlc->pf_memcpy( p_out, p_in, i_copy_pitch );
+ vlc_memcpy( p_out, p_in, i_copy_pitch );
p_in += i_in_pitch;
p_out += i_out_pitch;
}
DEL_CALLBACKS( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones],
SendEvents );
vlc_object_detach( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
- vout_Destroy( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
+ vlc_object_release( p_vout->p_sys->pp_vout[p_vout->p_sys->i_clones] );
}
}