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
(parent:
2c7ffe9
)
rtsp-stream: Don't mix IPv4 and IPv6 addresses
author
Sebastian Rasmussen
<sebras@hotmail.com>
Fri, 14 Mar 2014 18:03:24 +0000
(19:03 +0100)
committer
Sebastian Dröge
<sebastian@centricular.com>
Sat, 15 Mar 2014 14:44:25 +0000
(15:44 +0100)
Fixes https://bugzilla.gnome.org/show_bug.cgi?id=726362
gst/rtsp-server/rtsp-stream.c
patch
|
blob
|
history
diff --git
a/gst/rtsp-server/rtsp-stream.c
b/gst/rtsp-server/rtsp-stream.c
index
d4d1dbe
..
655545e
100644
(file)
--- a/
gst/rtsp-server/rtsp-stream.c
+++ b/
gst/rtsp-server/rtsp-stream.c
@@
-793,10
+793,10
@@
gst_rtsp_stream_get_multicast_address (GstRTSPStream * stream,
if (family == G_SOCKET_FAMILY_IPV6) {
flags = GST_RTSP_ADDRESS_FLAG_IPV6;
- addrp = &priv->addr_v
4
;
+ addrp = &priv->addr_v
6
;
} else {
flags = GST_RTSP_ADDRESS_FLAG_IPV4;
- addrp = &priv->addr_v
6
;
+ addrp = &priv->addr_v
4
;
}
g_mutex_lock (&priv->lock);
@@
-871,9
+871,9
@@
gst_rtsp_stream_reserve_address (GstRTSPStream * stream,
}
if (family == G_SOCKET_FAMILY_IPV6)
- addrp = &priv->addr_v4;
- else
addrp = &priv->addr_v6;
+ else
+ addrp = &priv->addr_v4;
g_mutex_lock (&priv->lock);
if (*addrp == NULL) {