vlc/vlc-1.2 | branch: master | Hugo Beauzée-Luyssen <beauz...@gmail.com> | Tue 
Jan 24 15:43:00 2012 +0100| [5bc01ff93bd031a6fafa83075ac6e4fd50bebdff] | 
committer: Jean-Baptiste Kempf

hls: Fixing a deadlock introduced in previous commit.

Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>
(cherry picked from commit 75fbc4d4b792f5e4b40d6257ce1d6daaa810cc2f)

Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>

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

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

diff --git a/modules/stream_filter/httplive.c b/modules/stream_filter/httplive.c
index d6b3fe1..c844c8a 100644
--- a/modules/stream_filter/httplive.c
+++ b/modules/stream_filter/httplive.c
@@ -1397,10 +1397,10 @@ static int hls_UpdatePlaylist(stream_t *s, hls_stream_t 
*hls_new, hls_stream_t *
                 }
                 free(segment->psz_key_path);
                 segment->psz_key_path = p->psz_key_path ? 
strdup(p->psz_key_path) : NULL;
-                vlc_mutex_unlock(&segment->lock);
                 segment_Free(p);
                 free(psz_url);
             }
+            vlc_mutex_unlock(&segment->lock);
         }
         else
         {

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to