[vlc-devel] commit: dv: destroy mutex after vlc_pthread_join() (Jean-Paul Saman )

git version control git at videolan.org
Thu Jun 25 10:55:53 CEST 2009


vlc | branch: 1.0-bugfix | Jean-Paul Saman <jean-paul.saman at m2x.nl> | Thu Jun 25 10:38:32 2009 +0200| [f23f5e62dcb29ca9b12a1cac73a00c464dbe6f3d] | committer: Jean-Paul Saman 

dv: destroy mutex after vlc_pthread_join()

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f23f5e62dcb29ca9b12a1cac73a00c464dbe6f3d
---

 modules/access/dv.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/access/dv.c b/modules/access/dv.c
index b21e962..aadc11e 100644
--- a/modules/access/dv.c
+++ b/modules/access/dv.c
@@ -275,17 +275,15 @@ static void Close( vlc_object_t *p_this )
         if( 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_mutex_destroy( &p_sys->p_ev->lock );
 
         /* Cleanup frame data */
         if( p_sys->p_ev->p_frame )
         {
-            vlc_mutex_lock( &p_sys->p_ev->lock );
             block_ChainRelease( p_sys->p_ev->p_frame );
             p_sys->p_ev->p_frame = NULL;
             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 );
     }




More information about the vlc-devel mailing list