[vlc-devel] commit: Do not hold change_lock while loading the vout module. ( Laurent Aimar )

git version control git at videolan.org
Tue Oct 20 19:29:45 CEST 2009


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Oct 17 20:14:10 2009 +0200| [fe587068239cf446a31c4638796b03718291ffcf] | committer: Laurent Aimar 

Do not hold change_lock while loading the vout module.

It allows the module to trigger some vout callback while loading.

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

 src/video_output/video_output.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 566126b..c5aa29b 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -979,9 +979,6 @@ static void* RunThread( void *p_this )
     bool            b_picture_interlaced_last = false;
     mtime_t         i_picture_interlaced_last_date;
 
-
-    vlc_mutex_lock( &p_vout->change_lock );
-
     /*
      * Initialize thread
      */
@@ -989,6 +986,9 @@ static void* RunThread( void *p_this )
                                     p_vout->p->psz_module_type,
                                     p_vout->p->psz_module_name,
                                     !strcmp(p_vout->p->psz_module_type, "video filter") );
+
+    vlc_mutex_lock( &p_vout->change_lock );
+
     if( p_vout->p_module )
         p_vout->b_error = InitThread( p_vout );
     else




More information about the vlc-devel mailing list