mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

gst/tcp/gstmultifdsink.c: Use IPPROTO_IP instead of SOL_IP, works on more platforms.

Browse source 
Original commit message from CVS:
2008-05-21  Julien Moutte  <julien@fluendo.com>

* gst/tcp/gstmultifdsink.c: (setup_dscp_client): Use IPPROTO_IP
instead of SOL_IP, works on more platforms.
* gst/typefind/gsttypefindfunctions.c: (aac_type_find): Fix printf
arguments.
This commit is contained in:
Julien Moutte 2008-05-21 16:47:58 +00:00
parent 2cdf18edff
commit 0f80e462d9
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2008-05-21 Julien Moutte <julien@fluendo.com>
* gst/tcp/gstmultifdsink.c: (setup_dscp_client): Use IPPROTO_IP
instead of SOL_IP, works on more platforms.
* gst/typefind/gsttypefindfunctions.c: (aac_type_find): Fix printf
arguments.
2008-05-21 Wim Taymans <wim.taymans@collabora.co.uk>
* ext/vorbis/vorbisdec.c:

5
gst/tcp/gstmultifdsink.c
View file

@ -745,12 +745,13 @@ setup_dscp_client (GstMultiFdSink * sink, GstTCPClient * client)
tos = (sink->qos_dscp & 0x3f) << 2;
switch (af) {
case AF_INET:
ret = setsockopt (client->fd.fd, SOL_IP, IP_TOS, &tos, sizeof (tos));
ret = setsockopt (client->fd.fd, IPPROTO_IP, IP_TOS, &tos, sizeof (tos));
break;
case AF_INET6:
#ifdef IPV6_TCLASS
ret =
setsockopt (client->fd.fd, SOL_IPV6, IPV6_TCLASS, &tos, sizeof (tos));
setsockopt (client->fd.fd, IPPROTO_IPV6, IPV6_TCLASS, &tos,
sizeof (tos));
break;
#endif
default:

8
gst/typefind/gsttypefindfunctions.c
View file

@ -565,8 +565,8 @@ aac_type_find (GstTypeFind * tf, gpointer unused)
snc = GST_READ_UINT16_BE (c.data);
if (G_UNLIKELY ((snc & 0xfff6) == 0xfff0)) {
/* ADTS header - find frame length */
GST_DEBUG ("Found one ADTS syncpoint at offset 0x%x, tracing next...",
c.offset);
GST_DEBUG ("Found one ADTS syncpoint at offset 0x%" G_GINT64_MODIFIER
"x, tracing next...", c.offset);
len = ((c.data[3] & 0x03) << 11) |
(c.data[4] << 3) | ((c.data[5] & 0xe0) >> 5);
@ -585,8 +585,8 @@ aac_type_find (GstTypeFind * tf, gpointer unused)
gst_type_find_suggest (tf, GST_TYPE_FIND_LIKELY, caps);
gst_caps_unref (caps);
GST_DEBUG ("Found second ADTS-%d syncpoint at offset 0x%x, framelen %u",
mpegversion, c.offset, len);
GST_DEBUG ("Found second ADTS-%d syncpoint at offset 0x%"
G_GINT64_MODIFIER "x, framelen %u", mpegversion, c.offset, len);
break;
}