[vlc-commits] input: fix infinite loop with threaded demux (fixes #15617)

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Oct 25 22:03:12 2015 +0200| [f2989d2eb2062795cbb9e1acc7ffde65a79ff2d5] | committer: Rémi Denis-Courmont

input: fix infinite loop with threaded demux (fixes #15617)

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

 src/input/input.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/input/input.c b/src/input/input.c
index f03d92b..f6fc62f 100644
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -686,8 +686,9 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
                 bool b_force_update = false;
 
                 MainLoopDemux( p_input, &b_force_update, i_start_mdate );
-                i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
 
+                if( p_input->p->master->p_demux->pf_demux != NULL )
+                    i_wakeup = es_out_GetWakeup( p_input->p->p_es_out );
                 if( b_force_update )
                     i_intf_update = 0;
             }