vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Fri Aug 15 
21:47:44 2014 +0300| [1e68f58eb16f1d6b6bc61bfdf5748243968e0608] | committer: 
Rémi Denis-Courmont

media_player: do not wait for input to stop when pausing (fixes #11767)

This lead to a deadlock when attempting to pause an input that did not
support pausing.

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

 lib/media_player.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/media_player.c b/lib/media_player.c
index 7201a78..c2bb7c2 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -903,7 +903,7 @@ void libvlc_media_player_set_pause( libvlc_media_player_t 
*p_mi, int paused )
             if( libvlc_media_player_can_pause( p_mi ) )
                 input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
             else
-                libvlc_media_player_stop( p_mi );
+                input_Stop( p_input_thread, true );
         }
     }
     else

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to