[vlc-devel] commit: mosaic: fix potential deadlock (unlocking in the right order). ( Rémi Duraffort )

git version control git at videolan.org
Fri Jun 26 14:42:07 CEST 2009


vlc | branch: 1.0-bugfix | Rémi Duraffort <ivoire at videolan.org> | Fri Jun 26 11:54:38 2009 +0200| [751e7e0979a2b50c505a7673d74a460ce83ce531] | committer: Rémi Duraffort 

mosaic: fix potential deadlock (unlocking in the right order).
(cherry picked from commit 3e5af5bd6e8dc933a9142e4d8e06881b474d26a9)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

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

 modules/video_filter/mosaic.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules/video_filter/mosaic.c b/modules/video_filter/mosaic.c
index 21357ba..5f141eb 100644
--- a/modules/video_filter/mosaic.c
+++ b/modules/video_filter/mosaic.c
@@ -671,8 +671,8 @@ static subpicture_t *Filter( filter_t *p_filter, mtime_t date )
         {
             msg_Err( p_filter, "cannot allocate SPU region" );
             p_filter->pf_sub_buffer_del( p_filter, p_spu );
-            vlc_mutex_unlock( &p_sys->lock );
             vlc_mutex_unlock( p_sys->p_lock );
+            vlc_mutex_unlock( &p_sys->lock );
             return p_spu;
         }
 




More information about the vlc-devel mailing list