From 42bb236284b09355d8bfde47fb4915dd1f07aa68 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Duraffort?= Date: Sat, 21 Jun 2008 20:08:37 +0200 Subject: [PATCH] Remove unnedeeded msg_Error. --- modules/video_filter/adjust.c | 3 --- modules/video_filter/alphamask.c | 3 --- modules/video_filter/atmo/atmo.cpp | 3 --- modules/video_filter/blend.c | 5 +---- modules/video_filter/bluescreen.c | 3 --- modules/video_filter/colorthres.c | 3 --- modules/video_filter/crop.c | 3 --- modules/video_filter/deinterlace.c | 3 --- modules/video_filter/dynamicoverlay/dynamicoverlay.c | 3 --- modules/video_filter/erase.c | 3 --- modules/video_filter/extract.c | 4 ---- modules/video_filter/gaussianblur.c | 3 --- modules/video_filter/gradient.c | 3 --- modules/video_filter/grain.c | 3 --- modules/video_filter/logo.c | 8 -------- modules/video_filter/magnify.c | 3 --- modules/video_filter/marq.c | 3 --- modules/video_filter/mosaic.c | 3 --- modules/video_filter/motionblur.c | 3 --- modules/video_filter/motiondetect.c | 3 --- modules/video_filter/noise.c | 3 --- modules/video_filter/opencv_example.cpp | 4 +--- modules/video_filter/opencv_wrapper.c | 3 --- modules/video_filter/osdmenu.c | 3 --- modules/video_filter/panoramix.c | 4 ---- modules/video_filter/psychedelic.c | 3 --- modules/video_filter/puzzle.c | 3 --- modules/video_filter/remoteosd.c | 3 --- modules/video_filter/ripple.c | 3 --- modules/video_filter/rotate.c | 3 --- modules/video_filter/rss.c | 5 ----- modules/video_filter/rv32.c | 5 +---- modules/video_filter/scale.c | 5 +---- modules/video_filter/seamcarving.c | 3 --- modules/video_filter/sharpen.c | 3 --- modules/video_filter/transform.c | 3 --- modules/video_filter/wall.c | 4 ---- modules/video_filter/wave.c | 3 --- 38 files changed, 4 insertions(+), 127 deletions(-) diff --git a/modules/video_filter/adjust.c b/modules/video_filter/adjust.c index 01c7af788e..9d5ff526e6 100644 --- a/modules/video_filter/adjust.c +++ b/modules/video_filter/adjust.c @@ -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 diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c index e3edea223f..58cacbfa51 100644 --- a/modules/video_filter/alphamask.c +++ b/modules/video_filter/alphamask.c @@ -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, diff --git a/modules/video_filter/atmo/atmo.cpp b/modules/video_filter/atmo/atmo.cpp index 84b3cd94bc..2381312977 100644 --- a/modules/video_filter/atmo/atmo.cpp +++ b/modules/video_filter/atmo/atmo.cpp @@ -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 )); diff --git a/modules/video_filter/blend.c b/modules/video_filter/blend.c index 5c29fecccd..89dfeba6b9 100644 --- a/modules/video_filter/blend.c +++ b/modules/video_filter/blend.c @@ -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; diff --git a/modules/video_filter/bluescreen.c b/modules/video_filter/bluescreen.c index 97ad84f9da..2499f55d9b 100644 --- a/modules/video_filter/bluescreen.c +++ b/modules/video_filter/bluescreen.c @@ -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, diff --git a/modules/video_filter/colorthres.c b/modules/video_filter/colorthres.c index 67ddf2429b..73b81d301c 100644 --- a/modules/video_filter/colorthres.c +++ b/modules/video_filter/colorthres.c @@ -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; diff --git a/modules/video_filter/crop.c b/modules/video_filter/crop.c index d7a24219cd..cb5fd1d525 100644 --- a/modules/video_filter/crop.c +++ b/modules/video_filter/crop.c @@ -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; diff --git a/modules/video_filter/deinterlace.c b/modules/video_filter/deinterlace.c index 9ebbf51e81..380d0f01ef 100644 --- a/modules/video_filter/deinterlace.c +++ b/modules/video_filter/deinterlace.c @@ -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; diff --git a/modules/video_filter/dynamicoverlay/dynamicoverlay.c b/modules/video_filter/dynamicoverlay/dynamicoverlay.c index da4d799cec..ad8b5d2eb0 100644 --- a/modules/video_filter/dynamicoverlay/dynamicoverlay.c +++ b/modules/video_filter/dynamicoverlay/dynamicoverlay.c @@ -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 ); diff --git a/modules/video_filter/erase.c b/modules/video_filter/erase.c index 19d1dbafd7..d2590482f5 100644 --- a/modules/video_filter/erase.c +++ b/modules/video_filter/erase.c @@ -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; diff --git a/modules/video_filter/extract.c b/modules/video_filter/extract.c index f08477f3fe..05db7c876c 100644 --- a/modules/video_filter/extract.c +++ b/modules/video_filter/extract.c @@ -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; } diff --git a/modules/video_filter/gaussianblur.c b/modules/video_filter/gaussianblur.c index e42832f5ad..357cc035b8 100644 --- a/modules/video_filter/gaussianblur.c +++ b/modules/video_filter/gaussianblur.c @@ -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 ); diff --git a/modules/video_filter/gradient.c b/modules/video_filter/gradient.c index c989023bfa..e060b3f73c 100644 --- a/modules/video_filter/gradient.c +++ b/modules/video_filter/gradient.c @@ -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; diff --git a/modules/video_filter/grain.c b/modules/video_filter/grain.c index 7029ac7ed1..dd07768e0d 100644 --- a/modules/video_filter/grain.c +++ b/modules/video_filter/grain.c @@ -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; diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c index 6fcedca021..7cbd77642b 100644 --- a/modules/video_filter/logo.c +++ b/modules/video_filter/logo.c @@ -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; } diff --git a/modules/video_filter/magnify.c b/modules/video_filter/magnify.c index a249928527..4c78bbb50d 100644 --- a/modules/video_filter/magnify.c +++ b/modules/video_filter/magnify.c @@ -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 ); diff --git a/modules/video_filter/marq.c b/modules/video_filter/marq.c index 28a54e0196..8a474c2b01 100644 --- a/modules/video_filter/marq.c +++ b/modules/video_filter/marq.c @@ -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 ) ); diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c index f912baca21..30cba8f62c 100644 --- a/modules/video_filter/mosaic.c +++ b/modules/video_filter/mosaic.c @@ -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; diff --git a/modules/video_filter/motionblur.c b/modules/video_filter/motionblur.c index cc45b5c6ab..53ce82b2d7 100644 --- a/modules/video_filter/motionblur.c +++ b/modules/video_filter/motionblur.c @@ -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; diff --git a/modules/video_filter/motiondetect.c b/modules/video_filter/motiondetect.c index d1fd08de95..9c91fd59ed 100644 --- a/modules/video_filter/motiondetect.c +++ b/modules/video_filter/motiondetect.c @@ -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; diff --git a/modules/video_filter/noise.c b/modules/video_filter/noise.c index eb26d3b494..030ca2ba1e 100644 --- a/modules/video_filter/noise.c +++ b/modules/video_filter/noise.c @@ -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; diff --git a/modules/video_filter/opencv_example.cpp b/modules/video_filter/opencv_example.cpp index 91f9c6bfd5..d4ba06c349 100644 --- a/modules/video_filter/opencv_example.cpp +++ b/modules/video_filter/opencv_example.cpp @@ -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)); diff --git a/modules/video_filter/opencv_wrapper.c b/modules/video_filter/opencv_wrapper.c index db6b4a527f..95b4607332 100644 --- a/modules/video_filter/opencv_wrapper.c +++ b/modules/video_filter/opencv_wrapper.c @@ -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 ); diff --git a/modules/video_filter/osdmenu.c b/modules/video_filter/osdmenu.c index 31d49c9fda..105089eb75 100644 --- a/modules/video_filter/osdmenu.c +++ b/modules/video_filter/osdmenu.c @@ -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 */ diff --git a/modules/video_filter/panoramix.c b/modules/video_filter/panoramix.c index 7a08fe68ad..9ba8c9d18f 100644 --- a/modules/video_filter/panoramix.c +++ b/modules/video_filter/panoramix.c @@ -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; } diff --git a/modules/video_filter/psychedelic.c b/modules/video_filter/psychedelic.c index 2620d3c731..8be202a218 100644 --- a/modules/video_filter/psychedelic.c +++ b/modules/video_filter/psychedelic.c @@ -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; diff --git a/modules/video_filter/puzzle.c b/modules/video_filter/puzzle.c index c2bcfd76ea..5f4fc1882e 100644 --- a/modules/video_filter/puzzle.c +++ b/modules/video_filter/puzzle.c @@ -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 ); diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c index 032d29ff0d..1b84c18938 100644 --- a/modules/video_filter/remoteosd.c +++ b/modules/video_filter/remoteosd.c @@ -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 */ diff --git a/modules/video_filter/ripple.c b/modules/video_filter/ripple.c index 3099dfd299..5dcbcb0ba0 100644 --- a/modules/video_filter/ripple.c +++ b/modules/video_filter/ripple.c @@ -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; diff --git a/modules/video_filter/rotate.c b/modules/video_filter/rotate.c index 7e87b40afc..38f3c062df 100644 --- a/modules/video_filter/rotate.c +++ b/modules/video_filter/rotate.c @@ -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, diff --git a/modules/video_filter/rss.c b/modules/video_filter/rss.c index 09c8e83197..28e0713d67 100644 --- a/modules/video_filter/rss.c +++ b/modules/video_filter/rss.c @@ -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 ); diff --git a/modules/video_filter/rv32.c b/modules/video_filter/rv32.c index 6b406ca0ac..1e4572bcc4 100644 --- a/modules/video_filter/rv32.c +++ b/modules/video_filter/rv32.c @@ -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; diff --git a/modules/video_filter/scale.c b/modules/video_filter/scale.c index 7b86ef4fee..53503ee798 100644 --- a/modules/video_filter/scale.c +++ b/modules/video_filter/scale.c @@ -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; diff --git a/modules/video_filter/seamcarving.c b/modules/video_filter/seamcarving.c index edaf74284b..e622370674 100644 --- a/modules/video_filter/seamcarving.c +++ b/modules/video_filter/seamcarving.c @@ -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; diff --git a/modules/video_filter/sharpen.c b/modules/video_filter/sharpen.c index a1a62210b8..ea5b9d03c7 100644 --- a/modules/video_filter/sharpen.c +++ b/modules/video_filter/sharpen.c @@ -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; diff --git a/modules/video_filter/transform.c b/modules/video_filter/transform.c index 40eab9db00..3f5f0ec7d8 100644 --- a/modules/video_filter/transform.c +++ b/modules/video_filter/transform.c @@ -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; diff --git a/modules/video_filter/wall.c b/modules/video_filter/wall.c index 2a2b53d203..3643755e5a 100644 --- a/modules/video_filter/wall.c +++ b/modules/video_filter/wall.c @@ -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; } diff --git a/modules/video_filter/wave.c b/modules/video_filter/wave.c index 1e6236a1c7..3a9c0a5439 100644 --- a/modules/video_filter/wave.c +++ b/modules/video_filter/wave.c @@ -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; -- 2.39.2