[vlc-commits] media_player: do not wait for input to stop when pausing (fixes #11767)

[Rémi Denis-Courmont]

vlc/vlc-2.2 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Aug 15 21:47:44 2014 +0300| [e2a4b90f4bf99498cb6144a8be6c85b822a4b3a3] | 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.

(cherry picked from commit 1e68f58eb16f1d6b6bc61bfdf5748243968e0608)

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

 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 b31a832..1a72207 100644
--- a/lib/media_player.c
+++ b/lib/media_player.c
@@ -782,7 +782,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