Commit 42bb2362 authored by ivoire's avatar ivoire
Browse files

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;
......
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