gst/smpte/gstsmptealpha.c: Fix debug statement arguments.
Original commit message from CVS: 2008-05-22 Julien Moutte <julien@fluendo.com> * gst/smpte/gstsmptealpha.c: (gst_smpte_alpha_setcaps): Fix debug statement arguments. * gst/udp/gstmultiudpsink.c: (gst_multiudpsink_setup_qos_dscp): * gst/udp/gstudpnetutils.c: (gst_udp_join_group), (gst_udp_leave_group): Fix IP and IPV6 options to make it work on more platforms.
This commit is contained in:
parent
707191104d
commit
a1a2879083
@ -1,3 +1,12 @@
|
|||||||
|
2008-05-22 Julien Moutte <julien@fluendo.com>
|
||||||
|
|
||||||
|
* gst/smpte/gstsmptealpha.c: (gst_smpte_alpha_setcaps): Fix
|
||||||
|
debug statement arguments.
|
||||||
|
* gst/udp/gstmultiudpsink.c: (gst_multiudpsink_setup_qos_dscp):
|
||||||
|
* gst/udp/gstudpnetutils.c: (gst_udp_join_group),
|
||||||
|
(gst_udp_leave_group): Fix IP and IPV6 options to make it work
|
||||||
|
on more platforms.
|
||||||
|
|
||||||
2008-05-21 Wim Taymans <wim.taymans@collabora.co.uk>
|
2008-05-21 Wim Taymans <wim.taymans@collabora.co.uk>
|
||||||
|
|
||||||
* tests/check/elements/avimux.c: (setup_src_pad),
|
* tests/check/elements/avimux.c: (setup_src_pad),
|
||||||
|
@ -343,7 +343,8 @@ mask_failed:
|
|||||||
}
|
}
|
||||||
unsupported_fourcc:
|
unsupported_fourcc:
|
||||||
{
|
{
|
||||||
GST_ERROR_OBJECT (smpte, "unsupported fourcc %" GST_FOURCC_FORMAT, fourcc);
|
GST_ERROR_OBJECT (smpte, "unsupported fourcc %" GST_FOURCC_FORMAT,
|
||||||
|
GST_FOURCC_ARGS (fourcc));
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -496,11 +496,12 @@ gst_multiudpsink_setup_qos_dscp (GstMultiUDPSink * sink)
|
|||||||
/* Extract and shift 6 bits of DSFIELD */
|
/* Extract and shift 6 bits of DSFIELD */
|
||||||
tos = (sink->qos_dscp & 0x3f) << 2;
|
tos = (sink->qos_dscp & 0x3f) << 2;
|
||||||
|
|
||||||
if (setsockopt (sink->sock, SOL_IP, IP_TOS, &tos, sizeof (tos)) < 0) {
|
if (setsockopt (sink->sock, IPPROTO_IP, IP_TOS, &tos, sizeof (tos)) < 0) {
|
||||||
GST_ERROR_OBJECT (sink, "could not set TOS: %s", g_strerror (errno));
|
GST_ERROR_OBJECT (sink, "could not set TOS: %s", g_strerror (errno));
|
||||||
}
|
}
|
||||||
#ifdef IPV6_TCLASS
|
#ifdef IPV6_TCLASS
|
||||||
if (setsockopt (sink->sock, SOL_IPV6, IPV6_TCLASS, &tos, sizeof (tos)) < 0) {
|
if (setsockopt (sink->sock, IPPROTO_IPV6, IPV6_TCLASS, &tos,
|
||||||
|
sizeof (tos)) < 0) {
|
||||||
GST_ERROR_OBJECT (sink, "could not set TCLASS: %s", g_strerror (errno));
|
GST_ERROR_OBJECT (sink, "could not set TCLASS: %s", g_strerror (errno));
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -164,7 +164,7 @@ gst_udp_join_group (int sockfd, struct sockaddr_storage *addr)
|
|||||||
mreq6.ipv6mr_interface = 0;
|
mreq6.ipv6mr_interface = 0;
|
||||||
|
|
||||||
if ((ret =
|
if ((ret =
|
||||||
setsockopt (sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
|
setsockopt (sockfd, IPPROTO_IPV6, IPV6_JOIN_GROUP,
|
||||||
(const void *) &mreq6, sizeof (mreq6))) < 0)
|
(const void *) &mreq6, sizeof (mreq6))) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
@ -207,7 +207,7 @@ gst_udp_leave_group (int sockfd, struct sockaddr_storage *addr)
|
|||||||
mreq6.ipv6mr_interface = 0;
|
mreq6.ipv6mr_interface = 0;
|
||||||
|
|
||||||
if ((ret =
|
if ((ret =
|
||||||
setsockopt (sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP,
|
setsockopt (sockfd, IPPROTO_IPV6, IPV6_LEAVE_GROUP,
|
||||||
(const void *) &mreq6, sizeof (mreq6))) < 0)
|
(const void *) &mreq6, sizeof (mreq6))) < 0)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user