projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
800b4bd
)
rtpsession: fix compilation
author
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 24 Sep 2010 12:09:12 +0000
(14:09 +0200)
committer
Wim Taymans
<wim.taymans@collabora.co.uk>
Fri, 24 Sep 2010 12:10:26 +0000
(14:10 +0200)
gst/rtpmanager/rtpsession.c
patch
|
blob
|
history
diff --git
a/gst/rtpmanager/rtpsession.c
b/gst/rtpmanager/rtpsession.c
index
c637005
..
59b16db
100644
(file)
--- a/
gst/rtpmanager/rtpsession.c
+++ b/
gst/rtpmanager/rtpsession.c
@@
-1100,15
+1100,15
@@
check_collision (RTPSession * sess, RTPSource * source,
/* If the source has been inactive for some time, we assume that it has
* simply changed its transport source address. Hence, there is no true
* third-party collision - only a simulated one. */
/* If the source has been inactive for some time, we assume that it has
* simply changed its transport source address. Hence, there is no true
* third-party collision - only a simulated one. */
- if (arrival->time > source->last_activity) {
- GstClockTime inactivity_period = arrival->time - source->last_activity;
- if (inactivity_period > 1*GST_SECOND) {
+ if (arrival->current_time > source->last_activity) {
+ GstClockTime inactivity_period =
+ arrival->current_time - source->last_activity;
+ if (inactivity_period > 1 * GST_SECOND) {
/* Use new network address */
if (rtp) {
g_assert (source->have_rtp_from);
rtp_source_set_rtp_from (source, &arrival->address);
/* Use new network address */
if (rtp) {
g_assert (source->have_rtp_from);
rtp_source_set_rtp_from (source, &arrival->address);
- }
- else {
+ } else {
g_assert (source->have_rtcp_from);
rtp_source_set_rtcp_from (source, &arrival->address);
}
g_assert (source->have_rtcp_from);
rtp_source_set_rtcp_from (source, &arrival->address);
}