Revert "Fixed deadlock when no data are received in rtp."

This reverts commit a34f07303469b45915a359273ff17143baa0c73d.

diff --git a/modules/access/rtp/input.c b/modules/access/rtp/input.c
index dc1110b149fa70fd2a7035e6220eb7d644af1217..0cfa4065ddcad868579a20767bd788b800826caf 100644 (file)
--- a/modules/access/rtp/input.c
+++ b/modules/access/rtp/input.c
@@ -196,9 +196,10 @@ void rtp_process (demux_t *demux)
     mtime_t deadline = INT64_MAX;
 
     vlc_mutex_lock (&p_sys->lock);
-    if (!rtp_dequeue (demux, p_sys->session, &deadline))
-        deadline = mdate () + CLOCK_FREQ / 5;
-    vlc_cond_timedwait (&p_sys->wait, &p_sys->lock, deadline);
+    if (rtp_dequeue (demux, p_sys->session, &deadline))
+        /* Pace the demux thread */
+        vlc_cond_timedwait (&p_sys->wait, &p_sys->lock, deadline);
+    else
+        vlc_cond_wait (&p_sys->wait, &p_sys->lock);
     vlc_mutex_unlock (&p_sys->lock);
 }
-