From 04757dd2d3e25ba2a32aa8030eb900cbad22c510 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Mon, 17 Sep 2007 17:17:29 +0000 Subject: [PATCH] Fix minor compilation warnings shown with Forte. Original commit message from CVS: * gst/gstbin.c: (gst_bin_continue_func): * libs/gst/base/gstbasesrc.c: (gst_base_src_do_sync): * libs/gst/base/gstcollectpads.c: (gst_collect_pads_add_pad_full): * plugins/elements/gstmultiqueue.c: (gst_multi_queue_loop): Fix minor compilation warnings shown with Forte. --- ChangeLog | 9 +++++++++ gst/gstbin.c | 3 ++- libs/gst/base/gstbasesrc.c | 2 +- libs/gst/base/gstcollectpads.c | 2 +- plugins/elements/gstmultiqueue.c | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 58d584d870..a22639376c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2007-09-17 Jan Schmidt - Sun Microsystems + + * gst/gstbin.c: (gst_bin_continue_func): + * libs/gst/base/gstbasesrc.c: (gst_base_src_do_sync): + * libs/gst/base/gstcollectpads.c: (gst_collect_pads_add_pad_full): + * plugins/elements/gstmultiqueue.c: (gst_multi_queue_loop): + + Fix minor compilation warnings shown with Forte. + 2007-09-17 Wim Taymans * plugins/elements/gstqueue.c: (apply_buffer), diff --git a/gst/gstbin.c b/gst/gstbin.c index c7ba5b7510..7413599fe1 100644 --- a/gst/gstbin.c +++ b/gst/gstbin.c @@ -2338,7 +2338,8 @@ static void gst_bin_continue_func (BinContinueData * data) { GstBin *bin; - GstState current, next, pending, transition; + GstState current, next, pending; + GstStateChange transition; GstStateChangeReturn ret; bin = data->bin; diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c index 28f95629ba..bde283ceaa 100644 --- a/libs/gst/base/gstbasesrc.c +++ b/libs/gst/base/gstbasesrc.c @@ -1519,7 +1519,7 @@ gst_base_src_do_sync (GstBaseSrc * basesrc, GstBuffer * buffer) GstBaseSrcClass *bclass; GstClockTime base_time; GstClock *clock; - GstClockTime now = -1, timestamp; + GstClockTime now = GST_CLOCK_TIME_NONE, timestamp; gboolean do_timestamp, first, pseudo_live; bclass = GST_BASE_SRC_GET_CLASS (basesrc); diff --git a/libs/gst/base/gstcollectpads.c b/libs/gst/base/gstcollectpads.c index 4aad59c9fe..a072f5e606 100644 --- a/libs/gst/base/gstcollectpads.c +++ b/libs/gst/base/gstcollectpads.c @@ -313,7 +313,7 @@ gst_collect_pads_add_pad_full (GstCollectPads * pads, GstPad * pad, guint size, /* FIXME: Ugly hack as we can't add more fields to GstCollectData */ g_object_set_data (G_OBJECT (pad), "gst-collect-data-destroy-notify", - destroy_notify); + (void *) destroy_notify); GST_COLLECT_PADS_PAD_LOCK (pads); GST_OBJECT_LOCK (pad); diff --git a/plugins/elements/gstmultiqueue.c b/plugins/elements/gstmultiqueue.c index 26f4f90ed5..f80863b124 100644 --- a/plugins/elements/gstmultiqueue.c +++ b/plugins/elements/gstmultiqueue.c @@ -705,7 +705,7 @@ gst_multi_queue_loop (GstPad * pad) GstMultiQueue *mq; GstMiniObject *object; guint32 newid; - guint32 oldid = -1; + guint32 oldid = G_MAXUINT32; GstFlowReturn result; sq = (GstSingleQueue *) gst_pad_get_element_private (pad);