Commit aafc08e4 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Remove useless test. At that point, p_sys is not NULL

parent 5e7be2ae
...@@ -154,6 +154,7 @@ static int OpenVideo( vlc_object_t *p_this ) ...@@ -154,6 +154,7 @@ static int OpenVideo( vlc_object_t *p_this )
p_vout->p_sys = malloc( sizeof( vout_sys_t ) ); p_vout->p_sys = malloc( sizeof( vout_sys_t ) );
if( p_vout->p_sys == NULL ) if( p_vout->p_sys == NULL )
return VLC_ENOMEM; return VLC_ENOMEM;
memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) ); memset( p_vout->p_sys, 0, sizeof( vout_sys_t ) );
if( VLC_SUCCESS != Direct3DVoutCreate( p_vout ) ) if( VLC_SUCCESS != Direct3DVoutCreate( p_vout ) )
...@@ -307,11 +308,8 @@ static void CloseVideo( vlc_object_t *p_this ) ...@@ -307,11 +308,8 @@ static void CloseVideo( vlc_object_t *p_this )
p_vout->p_sys->i_spi_screensavetimeout, NULL, 0); p_vout->p_sys->i_spi_screensavetimeout, NULL, 0);
} }
if( p_vout->p_sys )
{
free( p_vout->p_sys ); free( p_vout->p_sys );
p_vout->p_sys = NULL; p_vout->p_sys = NULL;
}
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -246,11 +246,8 @@ static void CloseVideo( vlc_object_t *p_this ) ...@@ -246,11 +246,8 @@ static void CloseVideo( vlc_object_t *p_this )
vlc_mutex_destroy( &p_vout->p_sys->lock ); vlc_mutex_destroy( &p_vout->p_sys->lock );
if( p_vout->p_sys )
{
free( p_vout->p_sys ); free( p_vout->p_sys );
p_vout->p_sys = NULL; p_vout->p_sys = NULL;
}
} }
/***************************************************************************** /*****************************************************************************
......
...@@ -358,11 +358,8 @@ static void CloseVideo ( vlc_object_t *p_this ) ...@@ -358,11 +358,8 @@ static void CloseVideo ( vlc_object_t *p_this )
FreeLibrary( p_vout->p_sys->gapi_dll ); FreeLibrary( p_vout->p_sys->gapi_dll );
#endif #endif
if( p_vout->p_sys )
{
free( p_vout->p_sys ); free( p_vout->p_sys );
p_vout->p_sys = NULL; p_vout->p_sys = 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