Commit 486e0fc1 authored by Jean-Paul Saman's avatar Jean-Paul Saman

dv: destroy mutex after vlc_pthread_join()

(cherry picked from commit f23f5e62)
Signed-off-by: Jean-Paul Saman's avatarJean-Paul Saman <jean-paul.saman@m2x.nl>
parent 10caa1ef
...@@ -275,17 +275,15 @@ static void Close( vlc_object_t *p_this ) ...@@ -275,17 +275,15 @@ static void Close( vlc_object_t *p_this )
if( p_sys->p_raw1394 ) if( p_sys->p_raw1394 )
raw1394_iso_shutdown( p_sys->p_raw1394 ); raw1394_iso_shutdown( p_sys->p_raw1394 );
vlc_mutex_destroy( &p_sys->p_ev->lock );
vlc_thread_join( p_sys->p_ev ); vlc_thread_join( p_sys->p_ev );
vlc_mutex_destroy( &p_sys->p_ev->lock );
/* Cleanup frame data */ /* Cleanup frame data */
if( p_sys->p_ev->p_frame ) if( p_sys->p_ev->p_frame )
{ {
vlc_mutex_lock( &p_sys->p_ev->lock );
block_ChainRelease( p_sys->p_ev->p_frame ); block_ChainRelease( p_sys->p_ev->p_frame );
p_sys->p_ev->p_frame = NULL; p_sys->p_ev->p_frame = NULL;
p_sys->p_ev->pp_last = &p_sys->p_frame; p_sys->p_ev->pp_last = &p_sys->p_frame;
vlc_mutex_unlock( &p_sys->p_ev->lock );
} }
vlc_object_release( p_sys->p_ev ); vlc_object_release( p_sys->p_ev );
} }
......
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