Commit 594d7138 authored by Jean-Paul Saman's avatar Jean-Paul Saman

Put just deleted objects to NULL.

parent 9b14f80f
...@@ -97,6 +97,7 @@ void image_HandlerDelete( image_handler_t *p_image ) ...@@ -97,6 +97,7 @@ void image_HandlerDelete( image_handler_t *p_image )
if( p_image->p_filter ) DeleteFilter( p_image->p_filter ); if( p_image->p_filter ) DeleteFilter( p_image->p_filter );
free( p_image ); free( p_image );
p_image = NULL;
} }
/** /**
...@@ -408,7 +409,7 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic, ...@@ -408,7 +409,7 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic,
{ {
/* We need to restart a new filter */ /* We need to restart a new filter */
DeleteFilter( p_image->p_filter ); DeleteFilter( p_image->p_filter );
p_image->p_filter = 0; p_image->p_filter = NULL;
} }
/* Start a filter */ /* Start a filter */
...@@ -654,6 +655,7 @@ static void DeleteDecoder( decoder_t * p_dec ) ...@@ -654,6 +655,7 @@ static void DeleteDecoder( decoder_t * p_dec )
es_format_Clean( &p_dec->fmt_out ); es_format_Clean( &p_dec->fmt_out );
vlc_object_destroy( p_dec ); vlc_object_destroy( p_dec );
p_dec = NULL;
} }
static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in, static encoder_t *CreateEncoder( vlc_object_t *p_this, video_format_t *fmt_in,
...@@ -736,6 +738,7 @@ static void DeleteEncoder( encoder_t * p_enc ) ...@@ -736,6 +738,7 @@ static void DeleteEncoder( encoder_t * p_enc )
es_format_Clean( &p_enc->fmt_out ); es_format_Clean( &p_enc->fmt_out );
vlc_object_destroy( p_enc ); vlc_object_destroy( p_enc );
p_enc = NULL;
} }
static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in, static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in,
...@@ -756,8 +759,8 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in, ...@@ -756,8 +759,8 @@ static filter_t *CreateFilter( vlc_object_t *p_this, es_format_t *p_fmt_in,
p_filter->fmt_out = *p_fmt_in; p_filter->fmt_out = *p_fmt_in;
p_filter->fmt_out.i_codec = p_fmt_out->i_chroma; p_filter->fmt_out.i_codec = p_fmt_out->i_chroma;
p_filter->fmt_out.video = *p_fmt_out; p_filter->fmt_out.video = *p_fmt_out;
p_filter->p_module = module_Need( p_filter, "video filter2", psz_module, p_filter->p_module = module_Need( p_filter, "video filter2",
0 ); psz_module, 0 );
if( !p_filter->p_module ) if( !p_filter->p_module )
{ {
...@@ -779,4 +782,5 @@ static void DeleteFilter( filter_t * p_filter ) ...@@ -779,4 +782,5 @@ static void DeleteFilter( filter_t * p_filter )
es_format_Clean( &p_filter->fmt_out ); es_format_Clean( &p_filter->fmt_out );
vlc_object_destroy( p_filter ); vlc_object_destroy( p_filter );
p_filter = 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