diff options
| author | Dave Robillard <dave@drobilla.net> | 2009-05-31 19:25:34 -0400 |
|---|---|---|
| committer | Dave Robillard <dave@drobilla.net> | 2009-05-31 19:25:34 -0400 |
| commit | b19dd5920605c0036dacf19591a6feca7a736a50 (patch) | |
| tree | d33824039c10756da4d306051165d6bbe707345a /gst/rtpmanager | |
| parent | b75a26657febaf86c4137b4d41c068926325e316 (diff) | |
| parent | 7c5ff224fcb10b82d6e591677d556143569e2844 (diff) | |
| download | gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.tar.gz gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.tar.bz2 gst-plugins-bad-b19dd5920605c0036dacf19591a6feca7a736a50.zip | |
Merge branch 'master' of git://anongit.freedesktop.org/gstreamer/gst-plugins-bad into fdo
Diffstat (limited to 'gst/rtpmanager')
| -rw-r--r-- | gst/rtpmanager/gstrtpbin.c | 4 | ||||
| -rw-r--r-- | gst/rtpmanager/rtpsource.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gst/rtpmanager/gstrtpbin.c b/gst/rtpmanager/gstrtpbin.c index 19de4f1b..482cf017 100644 --- a/gst/rtpmanager/gstrtpbin.c +++ b/gst/rtpmanager/gstrtpbin.c @@ -1758,7 +1758,7 @@ gst_rtp_bin_handle_message (GstBin * bin, GstMessage * message) const GstStructure *s = gst_message_get_structure (message); /* we change the structure name and add the session ID to it */ - if (gst_structure_has_name (s, "GstRTPSessionSDES")) { + if (gst_structure_has_name (s, "application/x-rtp-source-sdes")) { GSList *walk; /* find the session, the message source has it */ @@ -1771,8 +1771,6 @@ gst_rtp_bin_handle_message (GstBin * bin, GstMessage * message) message = gst_message_make_writable (message); s = gst_message_get_structure (message); - gst_structure_set_name ((GstStructure *) s, "GstRTPBinSDES"); - gst_structure_set ((GstStructure *) s, "session", G_TYPE_UINT, sess->id, NULL); break; diff --git a/gst/rtpmanager/rtpsource.c b/gst/rtpmanager/rtpsource.c index 355526ee..ed080717 100644 --- a/gst/rtpmanager/rtpsource.c +++ b/gst/rtpmanager/rtpsource.c @@ -199,6 +199,7 @@ make_address_string (GstNetAddress * addr, gchar * dest, gulong n) guint16 port; gst_netaddress_get_ip4_address (addr, &address, &port); + address = g_ntohl (address); g_snprintf (dest, n, "%d.%d.%d.%d:%d", (address >> 24) & 0xff, (address >> 16) & 0xff, (address >> 8) & 0xff, address & 0xff, @@ -321,7 +322,8 @@ rtp_source_create_sdes (RTPSource * src) GstStructure *s; gchar *str; - s = gst_structure_new ("application/x-rtp-source-sdes", NULL); + s = gst_structure_new ("application/x-rtp-source-sdes", + "ssrc", G_TYPE_UINT, (guint) src->ssrc, NULL); if ((str = rtp_source_get_sdes_string (src, GST_RTCP_SDES_CNAME))) { gst_structure_set (s, "cname", G_TYPE_STRING, str, NULL); |