Index: ext/ogg/gstoggdemux.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/ext/ogg/gstoggdemux.c,v
retrieving revision 1.138
diff -u -p -r1.138 gstoggdemux.c
--- ext/ogg/gstoggdemux.c	9 Mar 2006 17:45:39 -0000	1.138
+++ ext/ogg/gstoggdemux.c	19 Mar 2006 17:06:08 -0000
@@ -293,13 +293,19 @@ static void
 gst_ogg_pad_dispose (GObject * object)
 {
   GstOggPad *pad = GST_OGG_PAD (object);
+  GstPad **elem_pad_p;
+  GstElement **element_p;
+  GstPad **elem_out_p;
 
   if (pad->element)
     gst_element_set_state (pad->element, GST_STATE_NULL);
 
-  gst_object_replace ((GstObject **) (&pad->elem_pad), NULL);
-  gst_object_replace ((GstObject **) (&pad->element), NULL);
-  gst_object_replace ((GstObject **) (&pad->elem_out), NULL);
+  elem_pad_p = &pad->elem_pad;
+  element_p = &pad->element;
+  elem_out_p = &pad->elem_out;
+  gst_object_replace ((GstObject **) elem_pad_p, NULL);
+  gst_object_replace ((GstObject **) element_p, NULL);
+  gst_object_replace ((GstObject **) elem_out_p, NULL);
 
   pad->chain = NULL;
   pad->ogg = NULL;
Index: gst/playback/gstplaybin.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gstplaybin.c,v
retrieving revision 1.81
diff -u -p -r1.81 gstplaybin.c
--- gst/playback/gstplaybin.c	18 Feb 2006 19:10:35 -0000	1.81
+++ gst/playback/gstplaybin.c	19 Mar 2006 17:06:10 -0000
@@ -546,8 +546,9 @@ static void
 handoff (GstElement * identity, GstBuffer * frame, gpointer data)
 {
   GstPlayBin *play_bin = GST_PLAY_BIN (data);
+  GstBuffer **frame_p = &play_bin->frame;
 
-  gst_mini_object_replace ((GstMiniObject **) & play_bin->frame,
+  gst_mini_object_replace ((GstMiniObject **) frame_p,
       GST_MINI_OBJECT_CAST (frame));
 
   /* applications need to know the buffer caps,
Index: gst/playback/gststreamselector.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/gst/playback/gststreamselector.c,v
retrieving revision 1.15
diff -u -p -r1.15 gststreamselector.c
--- gst/playback/gststreamselector.c	16 Mar 2006 10:22:27 -0000	1.15
+++ gst/playback/gststreamselector.c	19 Mar 2006 17:06:10 -0000
@@ -181,6 +181,7 @@ gst_stream_selector_set_property (GObjec
     case PROP_ACTIVE_PAD:{
       const gchar *pad_name = g_value_get_string (value);
       GstPad *pad = NULL;
+      GstPad **active_pad_p;
 
       if (strcmp (pad_name, "") != 0) {
         pad = gst_element_get_pad (GST_ELEMENT (object), pad_name);
@@ -201,7 +202,8 @@ gst_stream_selector_set_property (GObjec
       }
 #endif
 
-      gst_object_replace ((GstObject **) (&sel->active_sinkpad),
+      active_pad_p = &sel->active_sinkpad;
+      gst_object_replace ((GstObject **) active_pad_p,
           GST_OBJECT_CAST (pad));
       if (pad)
         gst_object_unref (pad);
Index: sys/ximage/ximagesink.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/sys/ximage/ximagesink.c,v
retrieving revision 1.154
diff -u -p -r1.154 ximagesink.c
--- sys/ximage/ximagesink.c	18 Feb 2006 22:41:31 -0000	1.154
+++ sys/ximage/ximagesink.c	19 Mar 2006 17:06:11 -0000
@@ -606,7 +606,7 @@ gst_ximagesink_ximage_put (GstXImageSink
       gst_buffer_unref (ximagesink->cur_image);
     }
     GST_LOG_OBJECT (ximagesink, "reffing %p as our current image", ximage);
-    ximagesink->cur_image = GST_XIMAGE_BUFFER (gst_buffer_ref (ximage));
+    ximagesink->cur_image = GST_XIMAGE_BUFFER (gst_buffer_ref (GST_BUFFER (ximage)));
   }
 
   /* Expose sends a NULL image, we take the latest frame */
Index: sys/xvimage/xvimagesink.c
===================================================================
RCS file: /cvs/gstreamer/gst-plugins-base/sys/xvimage/xvimagesink.c,v
retrieving revision 1.146
diff -u -p -r1.146 xvimagesink.c
--- sys/xvimage/xvimagesink.c	5 Mar 2006 21:34:23 -0000	1.146
+++ sys/xvimage/xvimagesink.c	19 Mar 2006 17:06:12 -0000
@@ -635,7 +635,7 @@ gst_xvimagesink_xvimage_put (GstXvImageS
       gst_buffer_unref (xvimagesink->cur_image);
     }
     GST_LOG_OBJECT (xvimagesink, "reffing %p as our current image", xvimage);
-    xvimagesink->cur_image = GST_XVIMAGE_BUFFER (gst_buffer_ref (xvimage));
+    xvimagesink->cur_image = GST_XVIMAGE_BUFFER (gst_buffer_ref (GST_BUFFER (xvimage)));
   }
 
   /* Expose sends a NULL image, we take the latest frame */
