Skip to content

V
vlc
Commit a942c6c5 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/video_filter/deinterlace.c: avoid segfault when deinterlacing filter can't be loaded.

parent bdc9f256
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 4 deletions
modules/video_filter/deinterlace.c
View file @ a942c6c5
...@@ -165,6 +165,7 @@ static int Create( vlc_object_t *p_this ) ...@@ -165,6 +165,7 @@ static int Create( vlc_object_t *p_this )
p_vout->p_sys->i_mode = DEINTERLACE_DISCARD; p_vout->p_sys->i_mode = DEINTERLACE_DISCARD;
p_vout->p_sys->b_double_rate = 0; p_vout->p_sys->b_double_rate = 0;
p_vout->p_sys->last_date = 0; p_vout->p_sys->last_date = 0;
p_vout->p_sys->p_vout = 0;
vlc_mutex_init( p_vout, &p_vout->p_sys->filter_lock ); vlc_mutex_init( p_vout, &p_vout->p_sys->filter_lock );
#if defined(CAN_COMPILE_C_ALTIVEC) #if defined(CAN_COMPILE_C_ALTIVEC)
...@@ -383,10 +384,12 @@ static void Destroy( vlc_object_t *p_this ) ...@@ -383,10 +384,12 @@ static void Destroy( vlc_object_t *p_this )
{ {
vout_thread_t *p_vout = (vout_thread_t *)p_this; vout_thread_t *p_vout = (vout_thread_t *)p_this;
DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents ); if( p_vout->p_sys->p_vout )
{
vlc_object_detach( p_vout->p_sys->p_vout ); DEL_CALLBACKS( p_vout->p_sys->p_vout, SendEvents );
vout_Destroy( p_vout->p_sys->p_vout ); vlc_object_detach( p_vout->p_sys->p_vout );
vout_Destroy( p_vout->p_sys->p_vout );
}
DEL_PARENT_CALLBACKS( SendEventsToChild ); DEL_PARENT_CALLBACKS( SendEventsToChild );
......
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