Skip to content

V
vlc-2-2
Commit 1cfc0623 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

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

This reverts commit a34f0730.
parent e03130e4
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
modules/access/rtp/input.c
View file @ 1cfc0623
...@@ -196,9 +196,10 @@ void rtp_process (demux_t *demux) ...@@ -196,9 +196,10 @@ void rtp_process (demux_t *demux)
mtime_t deadline = INT64_MAX; mtime_t deadline = INT64_MAX;
vlc_mutex_lock (&p_sys->lock); vlc_mutex_lock (&p_sys->lock);
if (!rtp_dequeue (demux, p_sys->session, &deadline)) if (rtp_dequeue (demux, p_sys->session, &deadline))
deadline = mdate () + CLOCK_FREQ / 5; /* Pace the demux thread */
vlc_cond_timedwait (&p_sys->wait, &p_sys->lock, deadline); 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); 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