[vlc-devel] commit: Really used a weaker lock for input_ressource_HoldAout. ( Laurent Aimar )

git version control git at videolan.org
Fri Jun 19 00:13:06 CEST 2009


vlc | branch: 1.0-bugfix | Laurent Aimar <fenrir at videolan.org> | Thu Jun 18 23:47:15 2009 +0200| [6a747ce95e3d0a8f1848ec0440e195677fcdea00] | committer: Derk-Jan Hartman 

Really used a weaker lock for input_ressource_HoldAout.
(cherry picked from commit 1ba525b0c98ac9608080479648edeb486d978946)

Signed-off-by: Derk-Jan Hartman <hartman at videolan.org>

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

 src/input/resource.c |    6 +-----
 1 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/src/input/resource.c b/src/input/resource.c
index f10f40f..d0cd742 100644
--- a/src/input/resource.c
+++ b/src/input/resource.c
@@ -489,11 +489,7 @@ aout_instance_t *input_resource_RequestAout( input_resource_t *p_resource, aout_
 }
 aout_instance_t *input_resource_HoldAout( input_resource_t *p_resource )
 {
-    vlc_mutex_lock( &p_resource->lock );
-    aout_instance_t *p_ret = HoldAout( p_resource );
-    vlc_mutex_unlock( &p_resource->lock );
-
-    return p_ret;
+    return HoldAout( p_resource );
 }
 /* */
 sout_instance_t *input_resource_RequestSout( input_resource_t *p_resource, sout_instance_t *p_sout, const char *psz_sout )




More information about the vlc-devel mailing list