From: <do...@ke...> - 2008-05-21 16:48:05
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: dolphy Date: Wed May 21 2008 16:48:12 UTC Log message: 2008-05-21 Julien Moutte <ju...@fl...> * 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. Modified files: . : ChangeLog gst/tcp : gstmultifdsink.c gst/typefind : gsttypefindfunctions.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.3955&r2=1.3956 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/tcp/gstmultifdsink.c.diff?r1=1.97&r2=1.98 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/typefind/gsttypefindfunctions.c.diff?r1=1.161&r2=1.162 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.3955 retrieving revision 1.3956 diff -u -d -r1.3955 -r1.3956 --- ChangeLog 21 May 2008 16:44:12 -0000 1.3955 +++ ChangeLog 21 May 2008 16:47:56 -0000 1.3956 @@ -1,3 +1,10 @@ +2008-05-21 Julien Moutte <ju...@fl...> + + * 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...@co...> * ext/vorbis/vorbisdec.c: Index: gstmultifdsink.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/tcp/gstmultifdsink.c,v retrieving revision 1.97 retrieving revision 1.98 diff -u -d -r1.97 -r1.98 --- gstmultifdsink.c 21 May 2008 11:29:25 -0000 1.97 +++ gstmultifdsink.c 21 May 2008 16:47:58 -0000 1.98 @@ -745,12 +745,13 @@ 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)); #endif default: Index: gsttypefindfunctions.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/typefind/gsttypefindfunctions.c,v retrieving revision 1.161 retrieving revision 1.162 diff -u -d -r1.161 -r1.162 --- gsttypefindfunctions.c 19 May 2008 15:59:40 -0000 1.161 +++ gsttypefindfunctions.c 21 May 2008 16:47:58 -0000 1.162 @@ -565,8 +565,8 @@ 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 @@ 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; } |