[vlc-commits] mmal/vout: Remove bad locking

[Julian Scheel]

vlc | branch: master | Julian Scheel <julian at jusst.de> | Fri Aug 29 09:09:37 2014 +0200| [59b75775a00cd2d391872e8ff97af075b1f4e5c4] | committer: Rémi Denis-Courmont

mmal/vout: Remove bad locking

This removes some bad locking. In fact this lock could cause a deadlock on
shutdown as the lock is held by the main thread when shutting down and this
function might be called as a result of shutting the ports down.

Signed-off-by: Julian Scheel <julian at jusst.de>
Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>

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

 modules/hw/mmal/codec.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/modules/hw/mmal/codec.c b/modules/hw/mmal/codec.c
index 687e25b..d2424ea 100644
--- a/modules/hw/mmal/codec.c
+++ b/modules/hw/mmal/codec.c
@@ -449,10 +449,8 @@ static picture_t *decode(decoder_t *dec, block_t **pblock)
      * Configure output port if necessary
      */
     if (sys->output_format) {
-        vlc_mutex_lock(&sys->mutex);
         if (change_output_format(dec) < 0)
             msg_Err(dec, "Failed to change output port format");
-        vlc_mutex_unlock(&sys->mutex);
     }
 
     /*