Commit a34f0730 authored by Laurent Aimar's avatar Laurent Aimar

Fixed deadlock when no data are received in rtp.

 It might not be the cleanest way, but I don't see any other fix with the
current API.
 Feel free to revert if a better fix can be found.
parent 222e2acb
......@@ -199,10 +199,9 @@ void rtp_process (demux_t *demux)
mtime_t deadline;
vlc_mutex_lock (&p_sys->lock);
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);
if (!rtp_dequeue (demux, p_sys->session, &deadline))
deadline = mdate () + CLOCK_FREQ / 5;
vlc_cond_timedwait (&p_sys->wait, &p_sys->lock, deadline);
vlc_mutex_unlock (&p_sys->lock);
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment