? log
? tmpcvs20863
? tmpwrk20863
? check/log
? check/valgrind.log
? examples/log
? tests/check/libs/log
Index: gst/gstbin.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstbin.c,v
retrieving revision 1.329
diff -u -p -r1.329 gstbin.c
--- gst/gstbin.c	13 Mar 2006 11:04:38 -0000	1.329
+++ gst/gstbin.c	19 Mar 2006 15:21:29 -0000
@@ -417,14 +417,17 @@ static void
 gst_bin_dispose (GObject * object)
 {
   GstBin *bin = GST_BIN (object);
+  GstBus **child_bus_p = & bin->child_bus;
+  GstClock **provided_clock_p = &bin->provided_clock;
+  GstElement **clock_provider_p = &bin->clock_provider;
 
   GST_CAT_DEBUG_OBJECT (GST_CAT_REFCOUNTING, object, "dispose");
 
   bin_remove_messages (bin, NULL, GST_MESSAGE_ANY);
 
-  gst_object_replace ((GstObject **) & bin->child_bus, NULL);
-  gst_object_replace ((GstObject **) & bin->provided_clock, NULL);
-  gst_object_replace ((GstObject **) & bin->clock_provider, NULL);
+  gst_object_replace ((GstObject **) child_bus_p, NULL);
+  gst_object_replace ((GstObject **) provided_clock_p, NULL);
+  gst_object_replace ((GstObject **) clock_provider_p, NULL);
 
   while (bin->children) {
     gst_bin_remove (bin, GST_ELEMENT_CAST (bin->children->data));
@@ -517,6 +520,8 @@ gst_bin_provide_clock_func (GstElement *
   GstBin *bin;
   GstIterator *it;
   gpointer val;
+  GstClock **provided_clock_p;
+  GstElement **clock_provider_p;
 
   bin = GST_BIN (element);
 
@@ -546,9 +551,12 @@ gst_bin_provide_clock_func (GstElement *
       gst_object_unref (child);
     }
   }
-  gst_object_replace ((GstObject **) & bin->provided_clock,
+
+  provided_clock_p = & bin->provided_clock;
+  clock_provider_p = & bin->clock_provider;
+  gst_object_replace ((GstObject **) provided_clock_p,
       (GstObject *) result);
-  gst_object_replace ((GstObject **) & bin->clock_provider,
+  gst_object_replace ((GstObject **) clock_provider_p,
       (GstObject *) provider);
   bin->clock_dirty = FALSE;
   GST_DEBUG_OBJECT (bin,
@@ -1920,7 +1928,7 @@ gst_bin_send_event (GstElement * element
       {
         GstElement *child;
 
-        gst_event_ref (event);
+        event = gst_event_ref (event);
         child = GST_ELEMENT_CAST (data);
         res &= gst_element_send_event (child, event);
         gst_object_unref (child);
@@ -2131,6 +2139,8 @@ gst_bin_handle_message_func (GstBin * bi
     }
     case GST_MESSAGE_CLOCK_LOST:
     {
+      GstClock **provided_clock_p;
+      GstElement **clock_provider_p;
       gboolean playing, provided, forward;
       GstClock *clock;
 
@@ -2147,8 +2157,10 @@ gst_bin_handle_message_func (GstBin * bi
         GST_DEBUG_OBJECT (bin,
             "Lost clock %" GST_PTR_FORMAT " provided by %" GST_PTR_FORMAT,
             bin->provided_clock, bin->clock_provider);
-        gst_object_replace ((GstObject **) & bin->provided_clock, NULL);
-        gst_object_replace ((GstObject **) & bin->clock_provider, NULL);
+        provided_clock_p = &bin->provided_clock;
+        clock_provider_p = &bin->clock_provider;
+        gst_object_replace ((GstObject **) provided_clock_p, NULL);
+        gst_object_replace ((GstObject **) clock_provider_p, NULL);
       }
       GST_DEBUG_OBJECT (bin, "provided %d, playing %d, forward %d",
           provided, playing, forward);
Index: gst/gstbuffer.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstbuffer.c,v
retrieving revision 1.124
diff -u -p -r1.124 gstbuffer.c
--- gst/gstbuffer.c	14 Feb 2006 13:07:09 -0000	1.124
+++ gst/gstbuffer.c	19 Mar 2006 15:21:29 -0000
@@ -492,7 +492,7 @@ gst_buffer_create_sub (GstBuffer * buffe
   } else {
     parent = buffer;
   }
-  gst_buffer_ref (parent);
+  parent = gst_buffer_ref (parent);
 
   /* create the new buffer */
   subbuffer = (GstSubBuffer *) gst_mini_object_new (GST_TYPE_SUBBUFFER);
Index: gst/gstbus.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstbus.c,v
retrieving revision 1.56
diff -u -p -r1.56 gstbus.c
--- gst/gstbus.c	13 Mar 2006 11:04:38 -0000	1.56
+++ gst/gstbus.c	19 Mar 2006 15:21:30 -0000
@@ -523,7 +523,7 @@ gst_bus_peek (GstBus * bus)
   g_mutex_lock (bus->queue_lock);
   message = g_queue_peek_head (bus->queue);
   if (message)
-    gst_message_ref (message);
+    message = gst_message_ref (message);
   g_mutex_unlock (bus->queue_lock);
 
   GST_DEBUG_OBJECT (bus, "peek on bus, got message %p", message);
Index: gst/gstclock.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstclock.c,v
retrieving revision 1.89
diff -u -p -r1.89 gstclock.c
--- gst/gstclock.c	15 Mar 2006 20:17:40 -0000	1.89
+++ gst/gstclock.c	19 Mar 2006 15:21:30 -0000
@@ -622,9 +622,11 @@ static void
 gst_clock_dispose (GObject * object)
 {
   GstClock *clock = GST_CLOCK (object);
+  GstClock **master_p;
 
   GST_OBJECT_LOCK (clock);
-  gst_object_replace ((GstObject **) & clock->master, NULL);
+  master_p = &clock->master;
+  gst_object_replace ((GstObject **) master_p, NULL);
   GST_OBJECT_UNLOCK (clock);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
@@ -938,6 +940,8 @@ gst_clock_slave_callback (GstClock * mas
 gboolean
 gst_clock_set_master (GstClock * clock, GstClock * master)
 {
+  GstClock **master_p;
+
   g_return_val_if_fail (GST_IS_CLOCK (clock), FALSE);
   g_return_val_if_fail (master != clock, FALSE);
 
@@ -947,7 +951,8 @@ gst_clock_set_master (GstClock * clock, 
     goto not_supported;
 
   GST_DEBUG_OBJECT (clock, "slaving to master clock %p", master);
-  gst_object_replace ((GstObject **) & clock->master, (GstObject *) master);
+  master_p = &clock->master;
+  gst_object_replace ((GstObject **) master_p, (GstObject *) master);
   GST_OBJECT_UNLOCK (clock);
 
   GST_CLOCK_SLAVE_LOCK (clock);
Index: gst/gstelement.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstelement.c,v
retrieving revision 1.424
diff -u -p -r1.424 gstelement.c
--- gst/gstelement.c	13 Mar 2006 11:04:38 -0000	1.424
+++ gst/gstelement.c	19 Mar 2006 15:21:31 -0000
@@ -399,6 +399,7 @@ gst_element_set_clock (GstElement * elem
 {
   GstElementClass *oclass;
   gboolean res = TRUE;
+  GstClock **clock_p;
 
   g_return_val_if_fail (GST_IS_ELEMENT (element), FALSE);
 
@@ -411,7 +412,8 @@ gst_element_set_clock (GstElement * elem
 
   if (res) {
     GST_OBJECT_LOCK (element);
-    gst_object_replace ((GstObject **) & element->clock, (GstObject *) clock);
+    clock_p = &element->clock;
+    gst_object_replace ((GstObject **) clock_p, (GstObject *) clock);
     GST_OBJECT_UNLOCK (element);
   }
   return res;
@@ -2416,6 +2418,8 @@ static void
 gst_element_dispose (GObject * object)
 {
   GstElement *element = GST_ELEMENT (object);
+  GstClock **clock_p;
+  GstBus **bus_p;
 
   GST_CAT_INFO_OBJECT (GST_CAT_REFCOUNTING, element, "dispose");
 
@@ -2441,8 +2445,10 @@ gst_element_dispose (GObject * object)
   }
 
   GST_OBJECT_LOCK (element);
-  gst_object_replace ((GstObject **) & element->clock, NULL);
-  gst_object_replace ((GstObject **) & element->bus, NULL);
+  clock_p = &element->clock;
+  bus_p = &element->bus;
+  gst_object_replace ((GstObject **) clock_p, NULL);
+  gst_object_replace ((GstObject **) bus_p, NULL);
   GST_OBJECT_UNLOCK (element);
 
   GST_CAT_INFO_OBJECT (GST_CAT_REFCOUNTING, element, "parent class dispose");
@@ -2610,12 +2616,14 @@ gst_element_restore_thyself (GstObject *
 static void
 gst_element_set_bus_func (GstElement * element, GstBus * bus)
 {
+  GstBus **bus_p;
   g_return_if_fail (GST_IS_ELEMENT (element));
 
   GST_CAT_DEBUG_OBJECT (GST_CAT_PARENTAGE, element, "setting bus to %p", bus);
 
   GST_OBJECT_LOCK (element);
-  gst_object_replace ((GstObject **) & GST_ELEMENT_BUS (element),
+  bus_p = & GST_ELEMENT_BUS (element);
+  gst_object_replace ((GstObject **) bus_p,
       GST_OBJECT_CAST (bus));
   GST_OBJECT_UNLOCK (element);
 }
Index: gst/gstghostpad.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstghostpad.c,v
retrieving revision 1.33
diff -u -p -r1.33 gstghostpad.c
--- gst/gstghostpad.c	29 Jan 2006 17:37:08 -0000	1.33
+++ gst/gstghostpad.c	19 Mar 2006 15:21:31 -0000
@@ -383,9 +383,11 @@ static void
 gst_proxy_pad_dispose (GObject * object)
 {
   GstPad *pad = GST_PAD (object);
+  GstPad **target_p;
 
   GST_PROXY_LOCK (pad);
-  gst_object_replace ((GstObject **) & GST_PROXY_PAD_TARGET (pad), NULL);
+  target_p = & GST_PROXY_PAD_TARGET (pad);
+  gst_object_replace ((GstObject **) target_p, NULL);
   GST_PROXY_UNLOCK (pad);
 
   G_OBJECT_CLASS (gst_proxy_pad_parent_class)->dispose (object);
Index: gst/gstminiobject.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstminiobject.c,v
retrieving revision 1.24
diff -u -p -r1.24 gstminiobject.c
--- gst/gstminiobject.c	28 Feb 2006 10:52:02 -0000	1.24
+++ gst/gstminiobject.c	19 Mar 2006 15:21:31 -0000
@@ -397,10 +397,13 @@ gst_value_mini_object_lcopy (const GValu
 void
 gst_value_set_mini_object (GValue * value, GstMiniObject * mini_object)
 {
+  gpointer *pointer_p;
+
   g_return_if_fail (GST_VALUE_HOLDS_MINI_OBJECT (value));
   g_return_if_fail (mini_object == NULL || GST_IS_MINI_OBJECT (mini_object));
 
-  gst_mini_object_replace ((GstMiniObject **) & value->data[0].v_pointer,
+  pointer_p = & value->data[0].v_pointer;
+  gst_mini_object_replace ((GstMiniObject **) pointer_p,
       mini_object);
 }
 
@@ -417,10 +420,13 @@ gst_value_set_mini_object (GValue * valu
 void
 gst_value_take_mini_object (GValue * value, GstMiniObject * mini_object)
 {
+  gpointer *pointer_p;
+
   g_return_if_fail (GST_VALUE_HOLDS_MINI_OBJECT (value));
   g_return_if_fail (mini_object == NULL || GST_IS_MINI_OBJECT (mini_object));
 
-  gst_mini_object_replace ((GstMiniObject **) & value->data[0].v_pointer,
+  pointer_p = & value->data[0].v_pointer;
+  gst_mini_object_replace ((GstMiniObject **) pointer_p,
       mini_object);
   gst_mini_object_unref (mini_object);
 }
Index: gst/gstpad.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstpad.c,v
retrieving revision 1.501
diff -u -p -r1.501 gstpad.c
--- gst/gstpad.c	17 Mar 2006 19:27:51 -0000	1.501
+++ gst/gstpad.c	19 Mar 2006 15:21:33 -0000
@@ -1780,10 +1780,12 @@ prepare_failed:
 static void
 gst_pad_set_pad_template (GstPad * pad, GstPadTemplate * templ)
 {
+  GstPadTemplate **template_p;
   /* this function would need checks if it weren't static */
 
   GST_OBJECT_LOCK (pad);
-  gst_object_replace ((GstObject **) & pad->padtemplate, (GstObject *) templ);
+  template_p = & pad->padtemplate;
+  gst_object_replace ((GstObject **) template_p, (GstObject *) templ);
   GST_OBJECT_UNLOCK (pad);
 
   if (templ)
@@ -2752,7 +2754,7 @@ gst_pad_event_default_dispatch (GstPad *
        * to downstream to unref again when handled. */
       GST_LOG_OBJECT (pad, "Reffing and sending event %p (%s) to %s:%s",
           event, GST_EVENT_TYPE_NAME (event), GST_DEBUG_PAD_NAME (eventpad));
-      gst_event_ref (event);
+      event = gst_event_ref (event);
       gst_pad_push_event (eventpad, event);
     } else {
       /* we only send the event on one pad, multi-sinkpad elements
Index: gst/gstpipeline.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/gst/gstpipeline.c,v
retrieving revision 1.131
diff -u -p -r1.131 gstpipeline.c
--- gst/gstpipeline.c	14 Mar 2006 16:32:58 -0000	1.131
+++ gst/gstpipeline.c	19 Mar 2006 15:21:33 -0000
@@ -257,11 +257,12 @@ static void
 gst_pipeline_dispose (GObject * object)
 {
   GstPipeline *pipeline = GST_PIPELINE (object);
+  GstClock **clock_p = & pipeline->fixed_clock;
 
   GST_CAT_DEBUG_OBJECT (GST_CAT_REFCOUNTING, pipeline, "dispose");
 
   /* clear and unref any fixed clock */
-  gst_object_replace ((GstObject **) & pipeline->fixed_clock, NULL);
+  gst_object_replace ((GstObject **) clock_p, NULL);
 
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
@@ -705,12 +706,15 @@ gst_pipeline_get_clock (GstPipeline * pi
 void
 gst_pipeline_use_clock (GstPipeline * pipeline, GstClock * clock)
 {
+  GstClock **clock_p;
+
   g_return_if_fail (GST_IS_PIPELINE (pipeline));
 
   GST_OBJECT_LOCK (pipeline);
   GST_OBJECT_FLAG_SET (pipeline, GST_PIPELINE_FLAG_FIXED_CLOCK);
 
-  gst_object_replace ((GstObject **) & pipeline->fixed_clock,
+  clock_p = &pipeline->fixed_clock;
+  gst_object_replace ((GstObject **) clock_p,
       (GstObject *) clock);
   GST_OBJECT_UNLOCK (pipeline);
 
@@ -757,13 +761,16 @@ gst_pipeline_set_clock (GstPipeline * pi
 void
 gst_pipeline_auto_clock (GstPipeline * pipeline)
 {
+  GstClock **clock_p;
+
   g_return_if_fail (pipeline != NULL);
   g_return_if_fail (GST_IS_PIPELINE (pipeline));
 
   GST_OBJECT_LOCK (pipeline);
   GST_OBJECT_FLAG_UNSET (pipeline, GST_PIPELINE_FLAG_FIXED_CLOCK);
 
-  gst_object_replace ((GstObject **) & pipeline->fixed_clock, NULL);
+  clock_p = &pipeline->fixed_clock;
+  gst_object_replace ((GstObject **) clock_p, NULL);
   GST_OBJECT_UNLOCK (pipeline);
 
   GST_CAT_DEBUG (GST_CAT_CLOCK, "pipeline using automatic clock");
Index: libs/gst/base/gstbasesrc.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasesrc.c,v
retrieving revision 1.99
diff -u -p -r1.99 gstbasesrc.c
--- libs/gst/base/gstbasesrc.c	8 Mar 2006 13:44:55 -0000	1.99
+++ libs/gst/base/gstbasesrc.c	19 Mar 2006 15:21:33 -0000
@@ -888,7 +888,7 @@ gst_base_src_send_event (GstElement * el
       /* gst_event_replace? */
       if (src->data.ABI.pending_seek)
         gst_event_unref (src->data.ABI.pending_seek);
-      gst_event_ref (event);
+      event = gst_event_ref (event);
       src->data.ABI.pending_seek = event;
       GST_OBJECT_UNLOCK (src);
       result = TRUE;
Index: libs/gst/base/gstbasetransform.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstbasetransform.c,v
retrieving revision 1.73
diff -u -p -r1.73 gstbasetransform.c
--- libs/gst/base/gstbasetransform.c	13 Mar 2006 11:27:57 -0000	1.73
+++ libs/gst/base/gstbasetransform.c	19 Mar 2006 15:21:33 -0000
@@ -885,7 +885,7 @@ gst_base_transform_prepare_output_buffer
       if (trans->have_same_caps) {
         /* Input buffer is already writable and caps are the same, just ref and return it */
         *out_buf = in_buf;
-        gst_buffer_ref (in_buf);
+        in_buf = gst_buffer_ref (in_buf);
       } else {
         /* Writable buffer, but need to change caps => subbuffer */
         *out_buf = gst_buffer_create_sub (in_buf, 0, GST_BUFFER_SIZE (in_buf));
Index: libs/gst/base/gstcollectpads.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/base/gstcollectpads.c,v
retrieving revision 1.24
diff -u -p -r1.24 gstcollectpads.c
--- libs/gst/base/gstcollectpads.c	7 Feb 2006 15:49:39 -0000	1.24
+++ libs/gst/base/gstcollectpads.c	19 Mar 2006 15:21:33 -0000
@@ -446,7 +446,7 @@ gst_collect_pads_peek (GstCollectPads * 
   result = data->buffer;
 
   if (result)
-    gst_buffer_ref (result);
+    result = gst_buffer_ref (result);
 
   GST_DEBUG ("Peeking at pad %s:%s: buffer=%p",
       GST_DEBUG_PAD_NAME (data->pad), result);
@@ -472,6 +472,7 @@ GstBuffer *
 gst_collect_pads_pop (GstCollectPads * pads, GstCollectData * data)
 {
   GstBuffer *result;
+  GstBuffer **buffer_p;
 
   g_return_val_if_fail (pads != NULL, NULL);
   g_return_val_if_fail (GST_IS_COLLECT_PADS (pads), NULL);
@@ -479,7 +480,8 @@ gst_collect_pads_pop (GstCollectPads * p
 
   result = data->buffer;
   if (result) {
-    gst_buffer_replace (&data->buffer, NULL);
+    buffer_p = &data->buffer;
+    gst_buffer_replace (buffer_p, NULL);
     data->pos = 0;
     pads->queuedpads--;
   }
@@ -768,6 +770,7 @@ gst_collect_pads_chain (GstPad * pad, Gs
   GstCollectPads *pads;
   guint64 size;
   GstFlowReturn ret;
+  GstBuffer **buffer_p;
 
   GST_DEBUG ("Got buffer for pad %s:%s", GST_DEBUG_PAD_NAME (pad));
 
@@ -793,7 +796,8 @@ gst_collect_pads_chain (GstPad * pad, Gs
 
   /* One more pad has data queued */
   pads->queuedpads++;
-  gst_buffer_replace (&data->buffer, buffer);
+  buffer_p = &data->buffer;
+  gst_buffer_replace (buffer_p, buffer);
 
   if (data->segment.format == GST_FORMAT_TIME
       && GST_BUFFER_TIMESTAMP_IS_VALID (buffer))
Index: libs/gst/net/gstnettimeprovider.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/libs/gst/net/gstnettimeprovider.c,v
retrieving revision 1.8
diff -u -p -r1.8 gstnettimeprovider.c
--- libs/gst/net/gstnettimeprovider.c	12 Mar 2006 20:40:19 -0000	1.8
+++ libs/gst/net/gstnettimeprovider.c	19 Mar 2006 15:21:34 -0000
@@ -291,6 +291,7 @@ gst_net_time_provider_set_property (GObj
     const GValue * value, GParamSpec * pspec)
 {
   GstNetTimeProvider *self = GST_NET_TIME_PROVIDER (object);
+  GstClock **clock_p = & self->clock;
 
   switch (prop_id) {
     case PROP_PORT:
@@ -304,7 +305,7 @@ gst_net_time_provider_set_property (GObj
         self->address = g_strdup (g_value_get_string (value));
       break;
     case PROP_CLOCK:
-      gst_object_replace ((GstObject **) & self->clock,
+      gst_object_replace ((GstObject **) clock_p,
           (GstObject *) g_value_get_object (value));
       break;
     case PROP_ACTIVE:
Index: plugins/elements/gstcapsfilter.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/plugins/elements/gstcapsfilter.c,v
retrieving revision 1.20
diff -u -p -r1.20 gstcapsfilter.c
--- plugins/elements/gstcapsfilter.c	17 Jan 2006 12:14:20 -0000	1.20
+++ plugins/elements/gstcapsfilter.c	19 Mar 2006 15:21:34 -0000
@@ -242,8 +242,7 @@ gst_capsfilter_prepare_buf (GstBaseTrans
   if (GST_BUFFER_CAPS (input) != NULL) {
     /* Output buffer already has caps */
     GST_DEBUG_OBJECT (trans, "Input buffer already has caps");
-    gst_buffer_ref (input);
-    *buf = input;
+    *buf = gst_buffer_ref (input);
   } else {
     /* Buffer has no caps. See if the output pad only supports fixed caps */
     GstCaps *out_caps;
@@ -261,8 +260,7 @@ gst_capsfilter_prepare_buf (GstBaseTrans
       GST_DEBUG_OBJECT (trans, "Have fixed output caps %"
           GST_PTR_FORMAT " to apply to buffer with no caps", out_caps);
       if (gst_buffer_is_metadata_writable (input)) {
-        gst_buffer_ref (input);
-        *buf = input;
+        *buf = gst_buffer_ref (input);
       } else {
         GST_DEBUG_OBJECT (trans, "Creating sub-buffer and setting caps");
         *buf = gst_buffer_create_sub (input, 0, GST_BUFFER_SIZE (input));
Index: tests/check/gst/gstbuffer.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/check/gst/gstbuffer.c,v
retrieving revision 1.11
diff -u -p -r1.11 gstbuffer.c
--- tests/check/gst/gstbuffer.c	17 Jan 2006 12:14:20 -0000	1.11
+++ tests/check/gst/gstbuffer.c	19 Mar 2006 15:21:34 -0000
@@ -236,7 +236,7 @@ GST_START_TEST (test_make_writable)
   buf = gst_buffer_new_and_alloc (32);
   fail_unless (!GST_BUFFER_FLAG_IS_SET (buf, GST_BUFFER_FLAG_READONLY),
       "_new_and_alloc'ed buffer must not have read-only flag set");
-  gst_buffer_ref (buf);
+  buf = gst_buffer_ref (buf);
   buf2 = gst_buffer_make_writable (buf);
   fail_unless (buf != buf2, "_make_writable() should have returned a copy!");
   gst_buffer_unref (buf2);
@@ -277,7 +277,7 @@ GST_START_TEST (test_metadata_writable)
   fail_unless (gst_buffer_is_metadata_writable (buffer) == TRUE);
 
   /* Check that a buffer with refcount 2 does not have writable metadata */
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   ASSERT_BUFFER_REFCOUNT (buffer, "buffer", 2);
   fail_unless (gst_buffer_is_metadata_writable (buffer) == FALSE);
 
Index: tests/check/gst/gstevent.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/check/gst/gstevent.c,v
retrieving revision 1.12
diff -u -p -r1.12 gstevent.c
--- tests/check/gst/gstevent.c	22 Nov 2005 11:48:57 -0000	1.12
+++ tests/check/gst/gstevent.c	19 Mar 2006 15:21:34 -0000
@@ -208,9 +208,8 @@ event_probe (GstPad * pad, GstMiniObject
       case GST_EVENT_CUSTOM_BOTH_OOB:
         if (got_event_before_q != NULL)
           break;
-        gst_event_ref (data);
         g_get_current_time (&got_event_time);
-        got_event_before_q = GST_EVENT (data);
+        got_event_before_q = gst_event_ref (GST_EVENT (data));
         break;
       default:
         break;
@@ -223,9 +222,8 @@ event_probe (GstPad * pad, GstMiniObject
       case GST_EVENT_CUSTOM_BOTH_OOB:
         if (got_event_after_q != NULL)
           break;
-        gst_event_ref (data);
         g_get_current_time (&got_event_time);
-        got_event_after_q = GST_EVENT (data);
+        got_event_after_q = gst_event_ref (GST_EVENT (data));
         break;
       default:
         break;
Index: tests/check/gst/gstpad.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tests/check/gst/gstpad.c,v
retrieving revision 1.16
diff -u -p -r1.16 gstpad.c
--- tests/check/gst/gstpad.c	15 Oct 2005 15:53:57 -0000	1.16
+++ tests/check/gst/gstpad.c	19 Mar 2006 15:21:34 -0000
@@ -256,7 +256,7 @@ GST_START_TEST (test_push_unlinked)
 
   /* pushing on an unlinked pad will drop the buffer */
   buffer = gst_buffer_new ();
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   fail_unless (gst_pad_push (src, buffer) == GST_FLOW_NOT_LINKED);
   ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
   gst_buffer_unref (buffer);
@@ -266,7 +266,7 @@ GST_START_TEST (test_push_unlinked)
   id = gst_pad_add_buffer_probe (src, (GCallback) _probe_handler,
       GINT_TO_POINTER (0));
   buffer = gst_buffer_new ();
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   fail_unless (gst_pad_push (src, buffer) == GST_FLOW_OK);
   ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
   gst_buffer_unref (buffer);
@@ -277,7 +277,7 @@ GST_START_TEST (test_push_unlinked)
   id = gst_pad_add_buffer_probe (src, (GCallback) _probe_handler,
       GINT_TO_POINTER (1));
   buffer = gst_buffer_new ();
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   fail_unless (gst_pad_push (src, buffer) == GST_FLOW_NOT_LINKED);
   ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
   gst_buffer_unref (buffer);
@@ -328,7 +328,7 @@ GST_START_TEST (test_push_linked)
   /* test */
   /* pushing on a linked pad will drop the ref to the buffer */
   buffer = gst_buffer_new ();
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   fail_unless (gst_pad_push (src, buffer) == GST_FLOW_OK);
   ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 2);
   gst_buffer_unref (buffer);
@@ -344,7 +344,7 @@ GST_START_TEST (test_push_linked)
   id = gst_pad_add_buffer_probe (src, (GCallback) _probe_handler,
       GINT_TO_POINTER (0));
   buffer = gst_buffer_new ();
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   fail_unless (gst_pad_push (src, buffer) == GST_FLOW_OK);
   ASSERT_MINI_OBJECT_REFCOUNT (buffer, "buffer", 1);
   gst_buffer_unref (buffer);
@@ -355,7 +355,7 @@ GST_START_TEST (test_push_linked)
   id = gst_pad_add_buffer_probe (src, (GCallback) _probe_handler,
       GINT_TO_POINTER (1));
   buffer = gst_buffer_new ();
-  gst_buffer_ref (buffer);
+  buffer = gst_buffer_ref (buffer);
   fail_unless (gst_pad_push (src, buffer) == GST_FLOW_OK);
   gst_pad_remove_buffer_probe (src, id);
 
Index: tools/gst-launch.c
===================================================================
RCS file: /cvs/gstreamer/gstreamer/tools/gst-launch.c,v
retrieving revision 1.104
diff -u -p -r1.104 gst-launch.c
--- tools/gst-launch.c	14 Feb 2006 17:25:11 -0000	1.104
+++ tools/gst-launch.c	19 Mar 2006 15:21:34 -0000
@@ -533,6 +533,7 @@ main (int argc, char *argv[])
   ctx = g_option_context_new ("gst-launch");
   g_option_context_add_main_entries (ctx, options, GETTEXT_PACKAGE);
   g_option_context_add_group (ctx, gst_init_get_option_group ());
+/*   g_option_context_set_help_enabled (ctx, TRUE); */
   if (!g_option_context_parse (ctx, &argc, &argv, &err)) {
     g_print ("Error initializing: %s\n", GST_STR_NULL (err->message));
     exit (1);
Index: win32/common/config.h
===================================================================
RCS file: /cvs/gstreamer/gstreamer/win32/common/config.h,v
retrieving revision 1.41
diff -u -p -r1.41 config.h
--- win32/common/config.h	12 Mar 2006 20:40:19 -0000	1.41
+++ win32/common/config.h	19 Mar 2006 15:21:34 -0000
@@ -39,7 +39,7 @@
 #define GST_MAJORMINOR "0.10"
 
 /* Define host CPU */
-#define HOST_CPU "i686"
+#define HOST_CPU "x86_64"
 
 /* Define if the host CPU is an Alpha */
 #undef HAVE_CPU_ALPHA
