git.videolan.org
/
vlc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2b79de
)
Small race condition
author
Rémi Denis-Courmont
<remi@remlab.net>
Thu, 16 Apr 2009 15:33:39 +0000
(18:33 +0300)
committer
Rémi Denis-Courmont
<remi@remlab.net>
Thu, 16 Apr 2009 15:33:39 +0000
(18:33 +0300)
modules/access/rtp/input.c
patch
|
blob
|
history
diff --git
a/modules/access/rtp/input.c
b/modules/access/rtp/input.c
index
622e914
..
963fe3d
100644
(file)
--- a/
modules/access/rtp/input.c
+++ b/
modules/access/rtp/input.c
@@
-203,6
+203,7
@@
int rtp_process (demux_t *demux)
{
demux_sys_t *p_sys = demux->p_sys;
mtime_t deadline = INT64_MAX;
+ int ret;
vlc_mutex_lock (&p_sys->lock);
if (rtp_dequeue (demux, p_sys->session, &deadline))
@@
-210,7
+211,8
@@
int rtp_process (demux_t *demux)
vlc_cond_timedwait (&p_sys->wait, &p_sys->lock, deadline);
else
vlc_cond_wait (&p_sys->wait, &p_sys->lock);
+ ret = p_sys->dead ? -1 : 0;
vlc_mutex_unlock (&p_sys->lock);
- return
p_sys->dead ? -1 : 0
;
+ return
ret
;
}