From a1a2879083b10e0e8c74d8a65e7b9a76f568526c Mon Sep 17 00:00:00 2001 From: Julien Moutte Date: Thu, 22 May 2008 11:19:03 +0000 Subject: gst/smpte/gstsmptealpha.c: Fix debug statement arguments. Original commit message from CVS: 2008-05-22 Julien Moutte * 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. --- ChangeLog | 9 +++++++++ gst/smpte/gstsmptealpha.c | 3 ++- gst/udp/gstmultiudpsink.c | 5 +++-- gst/udp/gstudpnetutils.c | 4 ++-- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d2462d03..737e8385 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-05-22 Julien Moutte + + * 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 * tests/check/elements/avimux.c: (setup_src_pad), diff --git a/gst/smpte/gstsmptealpha.c b/gst/smpte/gstsmptealpha.c index 5da53f32..95c8b245 100644 --- a/gst/smpte/gstsmptealpha.c +++ b/gst/smpte/gstsmptealpha.c @@ -343,7 +343,8 @@ mask_failed: } 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; } } diff --git a/gst/udp/gstmultiudpsink.c b/gst/udp/gstmultiudpsink.c index 449bf714..c1c86df4 100644 --- a/gst/udp/gstmultiudpsink.c +++ b/gst/udp/gstmultiudpsink.c @@ -496,11 +496,12 @@ gst_multiudpsink_setup_qos_dscp (GstMultiUDPSink * sink) /* Extract and shift 6 bits of DSFIELD */ 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)); } #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)); } #endif diff --git a/gst/udp/gstudpnetutils.c b/gst/udp/gstudpnetutils.c index ff5e9387..5464ddac 100644 --- a/gst/udp/gstudpnetutils.c +++ b/gst/udp/gstudpnetutils.c @@ -164,7 +164,7 @@ gst_udp_join_group (int sockfd, struct sockaddr_storage *addr) mreq6.ipv6mr_interface = 0; if ((ret = - setsockopt (sockfd, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP, + setsockopt (sockfd, IPPROTO_IPV6, IPV6_JOIN_GROUP, (const void *) &mreq6, sizeof (mreq6))) < 0) return ret; @@ -207,7 +207,7 @@ gst_udp_leave_group (int sockfd, struct sockaddr_storage *addr) mreq6.ipv6mr_interface = 0; if ((ret = - setsockopt (sockfd, IPPROTO_IPV6, IPV6_DROP_MEMBERSHIP, + setsockopt (sockfd, IPPROTO_IPV6, IPV6_LEAVE_GROUP, (const void *) &mreq6, sizeof (mreq6))) < 0) return ret; } -- cgit