Commit e12f10f7 authored by Laurent Aimar's avatar Laurent Aimar

Destroyed the spu object inside vout_Close.

It avoids a vlc_object_detach.
parent 38ed2e8e
......@@ -155,6 +155,7 @@ static vout_thread_t *VoutCreate(vlc_object_t *object,
/* */
if (vlc_clone(&vout->p->thread, Thread, vout,
VLC_THREAD_PRIORITY_OUTPUT)) {
spu_Destroy(vout->p->p_spu);
vlc_object_release(vout);
return NULL;
}
......@@ -228,12 +229,13 @@ void vout_Close(vout_thread_t *vout)
if (vout->p->input)
spu_Attach(vout->p->p_spu, vout->p->input, false);
vlc_object_detach(vout->p->p_spu);
vout_snapshot_End(&vout->p->snapshot);
vout_control_PushVoid(&vout->p->control, VOUT_CONTROL_CLEAN);
vlc_join(vout->p->thread, NULL);
spu_Destroy(vout->p->p_spu);
}
/* */
......@@ -246,9 +248,6 @@ static void VoutDestructor(vlc_object_t *object)
free(vout->p->splitter_name);
/* */
spu_Destroy(vout->p->p_spu);
/* Destroy the locks */
vlc_mutex_destroy(&vout->p->picture_lock);
vlc_mutex_destroy(&vout->p->vfilter_lock);
......
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