summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul HENRYS <visechelle@gmail.com>2013-02-13 10:46:54 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2013-02-22 09:28:07 +0200
commit10802cae7339ff1a3e35723159a122088c202933 (patch)
tree148ef977d240a3b2c51465dd0c800fb39598809c
parentf5cb19e28762bfebeacbbae2159667ba45cb03dc (diff)
rtpsession: Fix wrong code organisation in case of collision
change_ssrc field of RTPSession should be set before calling rtp_session_schedule_bye_locked () as this function will call reconsider function that will wake up rtcp_thread which will call rtp_session_on_timeout () that will check change_ssrc to change the ssrc. Fixes https://bugzilla.gnome.org/show_bug.cgi?id=694184
-rw-r--r--gst/rtpmanager/rtpsession.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/rtpmanager/rtpsession.c b/gst/rtpmanager/rtpsession.c
index b41bb0d8d..af35add43 100644
--- a/gst/rtpmanager/rtpsession.c
+++ b/gst/rtpmanager/rtpsession.c
@@ -1312,10 +1312,10 @@ check_collision (RTPSession * sess, RTPSource * source,
GST_DEBUG ("Collision for SSRC %x", rtp_source_get_ssrc (source));
on_ssrc_collision (sess, source);
+ sess->change_ssrc = TRUE;
+
rtp_session_schedule_bye_locked (sess, "SSRC Collision",
arrival->current_time);
-
- sess->change_ssrc = TRUE;
}
}