Commit 674ccb48 authored by Laurent Aimar's avatar Laurent Aimar

Clean up spu/filters when a vout module cannot be loaded.

(The clean up path of vout is in a need of more cleaning).
parent 18516cc6
......@@ -395,6 +395,8 @@ vout_thread_t * __vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
if( p_vout->p_module == NULL )
{
msg_Err( p_vout, "no suitable vout module" );
// FIXME it's ugly but that's exactly the function that need to be called.
EndThread( p_vout );
vlc_object_detach( p_vout );
vlc_object_release( p_vout );
return NULL;
......@@ -1214,6 +1216,8 @@ static void EndThread( vout_thread_t *p_vout )
}
#endif
/* FIXME does that function *really* need to be called inside the thread ? */
/* Destroy subpicture unit */
spu_Attach( p_vout->p_spu, VLC_OBJECT(p_vout), false );
spu_Destroy( p_vout->p_spu );
......
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