Commit 42bb2362 authored by Rémi Duraffort's avatar Rémi Duraffort

Remove unnedeeded msg_Error.

parent b674dab8
......@@ -155,10 +155,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys = p_filter->p_sys;
/* needed to get options passed in transcode using the
......
......@@ -102,10 +102,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys = p_filter->p_sys;
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
......
......@@ -1375,10 +1375,7 @@ static int CreateFilter( vlc_object_t *p_this )
p_sys = (filter_sys_t *)malloc( sizeof( filter_sys_t ) );
p_filter->p_sys = p_sys;
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory for p_sys structure" );
return VLC_ENOMEM;
}
/* set all entries to zero */
memset(p_sys, 0, sizeof( filter_sys_t ));
......
......@@ -134,10 +134,7 @@ static int OpenFilter( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
if( ( p_filter->p_sys = p_sys =
(filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
return VLC_ENOMEM;
/* Misc init */
p_filter->pf_video_blend = Blend;
......
......@@ -124,10 +124,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys = p_filter->p_sys;
config_ChainParse( p_filter, CFG_PREFIX, ppsz_filter_options,
......
......@@ -125,10 +125,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -183,10 +183,7 @@ static int Create( vlc_object_t *p_this )
/* 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;
......
......@@ -192,10 +192,7 @@ static int Create( vlc_object_t *p_this )
/* 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;
......
......@@ -94,10 +94,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys = p_filter->p_sys;
BufferInit( &p_sys->input );
......
......@@ -146,10 +146,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys = p_filter->p_sys;
p_filter->pf_video_filter = Filter;
......
......@@ -127,15 +127,11 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->p_sys->projection_matrix = malloc( 9 * sizeof( int ) );
if( !p_filter->p_sys->projection_matrix )
{
free( p_filter->p_sys );
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
......
......@@ -152,10 +152,7 @@ static int Create( vlc_object_t *p_this )
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
p_filter->p_cfg );
......
......@@ -146,10 +146,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -82,10 +82,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -315,14 +315,10 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_sys = p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_sys == NULL )
{
msg_Err( p_vout, "out of memory" );
return VLC_ENOMEM;
}
p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
if( p_logo_list == NULL )
{
msg_Err( p_vout, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
......@@ -708,14 +704,10 @@ static int CreateFilter( vlc_object_t *p_this )
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_logo_list = p_sys->p_logo_list = malloc( sizeof( logo_list_t ) );
if( p_logo_list == NULL )
{
msg_Err( p_filter, "out of memory" );
free( p_sys );
return VLC_ENOMEM;
}
......
......@@ -113,10 +113,7 @@ static int Create( vlc_object_t *p_this )
/* 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->p_sys->p_image = image_HandlerCreate( p_vout );
......
......@@ -199,10 +199,7 @@ static int CreateFilter( vlc_object_t *p_this )
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys->p_style = malloc( sizeof( text_style_t ) );
memcpy( p_sys->p_style, &default_text_style, sizeof( text_style_t ) );
......
......@@ -295,10 +295,7 @@ static int CreateFilter( vlc_object_t *p_this )
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_sub_filter = Filter;
......
......@@ -96,10 +96,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -104,10 +104,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->p_sys->p_oldpix = NULL;
p_filter->p_sys->p_buf = NULL;
......
......@@ -83,10 +83,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -90,8 +90,7 @@ static int OpenFilter( vlc_object_t *p_this )
if( ( p_filter->p_sys = p_sys =
(filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
return VLC_ENOMEM;
}
//init the video_filter_event_info_t struct
......@@ -206,7 +205,6 @@ static picture_t *Filter( filter_t *p_filter, picture_t *p_pic )
if( NULL == ( p_filter->p_sys->event_info.p_region =
(video_filter_region_info_t *)malloc(faces->total*sizeof(video_filter_region_info_t))))
{
msg_Err( p_filter, "out of memory" );
return NULL;
}
memset(p_filter->p_sys->event_info.p_region, 0, faces->total*sizeof(video_filter_region_info_t));
......
......@@ -191,10 +191,7 @@ static int Create( vlc_object_t *p_this )
/* 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;
}
/* Init structure */
p_vout->p_sys->p_image = image_HandlerCreate( p_vout );
......
......@@ -184,10 +184,7 @@ static int CreateFilter ( vlc_object_t *p_this )
p_filter->p_sys = p_sys = (filter_sys_t *) malloc( sizeof(filter_sys_t) );
if( !p_filter->p_sys )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
memset( p_sys, 0, sizeof(filter_sys_t) );
/* Populating struct */
......
......@@ -295,10 +295,7 @@ static int Create( vlc_object_t *p_this )
/* 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;
......@@ -430,7 +427,6 @@ case VLC_FOURCC('c','y','u','v'): // packed by 2
sizeof(struct vout_list_t) );
if( p_vout->p_sys->pp_vout == NULL )
{
msg_Err( p_vout, "out of memory" );
free( p_vout->p_sys );
return VLC_ENOMEM;
}
......
......@@ -87,10 +87,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -204,10 +204,7 @@ static int Create( vlc_object_t *p_this )
/* 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->p_sys->p_image = image_HandlerCreate( p_vout );
......
......@@ -260,10 +260,7 @@ static int CreateFilter ( vlc_object_t *p_this )
p_filter->p_sys = p_sys = (filter_sys_t *) malloc( sizeof(filter_sys_t) );
if( !p_filter->p_sys )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
memset( p_sys, 0, sizeof(filter_sys_t) );
/* Populating struct */
......
......@@ -84,10 +84,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -131,10 +131,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_sys = p_filter->p_sys;
config_ChainParse( p_filter, FILTER_PREFIX, ppsz_filter_options,
......
......@@ -241,10 +241,7 @@ static int CreateFilter( vlc_object_t *p_this )
/* Allocate structure */
p_sys = p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
vlc_mutex_init( &p_sys->lock );
vlc_mutex_lock( &p_sys->lock );
......@@ -267,7 +264,6 @@ static int CreateFilter( vlc_object_t *p_this )
p_sys->psz_marquee = (char *)malloc( p_sys->i_length + 1 );
if( p_sys->psz_marquee == NULL )
{
msg_Err( p_filter, "out of memory" );
vlc_mutex_unlock( &p_sys->lock );
vlc_mutex_destroy( &p_sys->lock );
free( p_sys );
......@@ -278,7 +274,6 @@ static int CreateFilter( vlc_object_t *p_this )
p_sys->p_style = malloc( sizeof( text_style_t ));
if( p_sys->p_style == NULL )
{
msg_Err( p_filter, "out of memory" );
free( p_sys->psz_marquee );
vlc_mutex_unlock( &p_sys->lock );
vlc_mutex_destroy( &p_sys->lock );
......
......@@ -77,10 +77,7 @@ static int OpenFilter( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
if( ( p_filter->p_sys = p_sys =
(filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
return VLC_ENOMEM;
p_filter->pf_video_filter = Filter;
......
......@@ -82,10 +82,7 @@ static int OpenFilter( vlc_object_t *p_this )
/* Allocate the memory needed to store the decoder's structure */
if( ( p_filter->p_sys = p_sys =
(filter_sys_t *)malloc(sizeof(filter_sys_t)) ) == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_EGENERIC;
}
return VLC_ENOMEM;
p_filter->pf_video_filter = Filter;
......
......@@ -84,10 +84,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
p_filter->p_sys->p_energy = NULL;
......
......@@ -121,10 +121,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
......@@ -127,10 +127,7 @@ static int Create( vlc_object_t *p_this )
/* 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;
......
......@@ -147,10 +147,7 @@ static int Create( vlc_object_t *p_this )
/* 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;
......@@ -177,7 +174,6 @@ static int Create( vlc_object_t *p_this )
sizeof(struct vout_list_t) );
if( p_vout->p_sys->pp_vout == NULL )
{
msg_Err( p_vout, "out of memory" );
free( p_vout->p_sys );
return VLC_ENOMEM;
}
......
......@@ -85,10 +85,7 @@ static int Create( vlc_object_t *p_this )
/* Allocate structure */
p_filter->p_sys = malloc( sizeof( filter_sys_t ) );
if( p_filter->p_sys == NULL )
{
msg_Err( p_filter, "out of memory" );
return VLC_ENOMEM;
}
p_filter->pf_video_filter = Filter;
......
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