[vlc-devel] commit: Revert "Fixed deadlock when no data are received in rtp." ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rdenis at simphalempin.com> | Thu Nov 27 17:54:22 2008 +0200| [1cfc062386350ce6ae10b411bfbd4ca9016d60e6] | committer: Rémi Denis-Courmont 

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

This reverts commit a34f07303469b45915a359273ff17143baa0c73d.

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

 modules/access/rtp/input.c |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/access/rtp/input.c b/modules/access/rtp/input.c
index dc1110b..0cfa406 100644
--- 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);
 }
-