[vlc-commits] vout: remove unncessary lock in vout_HoldPicture()

Rémi Denis-Courmont git at videolan.org
Sat Nov 1 10:31:46 CET 2014


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 30 22:57:51 2014 +0200| [7e864e866a1e72a07bf5bd96941bbef539ca710c] | committer: Rémi Denis-Courmont

vout: remove unncessary lock in vout_HoldPicture()

picture_Hold() is reentrant anyway. The vout picture lock protects
the decoder pool. The decoder pool may be modified by picture_Release()
but not by picture_Hold().

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

 src/video_output/video_output.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 32d0915..44f470e 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -458,11 +458,7 @@ void vout_ReleasePicture(vout_thread_t *vout, picture_t *picture)
  */
 void vout_HoldPicture(vout_thread_t *vout, picture_t *picture)
 {
-    vlc_mutex_lock(&vout->p->picture_lock);
-
     picture_Hold(picture);
-
-    vlc_mutex_unlock(&vout->p->picture_lock);
 }
 
 /* */



More information about the vlc-commits mailing list