From 8f194ed84841889ada302604270ee156b175a3e6 Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Tue, 21 Mar 2006 14:26:01 +0000 Subject: [PATCH] gcc 4.1 unreferenced pointer fixes. Original commit message from CVS: * ext/ogg/gstoggdemux.c: (gst_ogg_pad_dispose): * gst/playback/gstplaybin.c: (handoff): * gst/playback/gststreamselector.c: (gst_stream_selector_set_property): gcc 4.1 unreferenced pointer fixes. * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_put): * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_put): gst_buffer_ref() now takes a GstBuffer*. --- ChangeLog | 11 +++++++++++ ext/ogg/gstoggdemux.c | 12 +++++++++--- gst/playback/gstplaybin.c | 3 ++- gst/playback/gststreamselector.c | 5 +++-- sys/ximage/ximagesink.c | 3 ++- sys/xvimage/xvimagesink.c | 3 ++- 6 files changed, 29 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index d009551..2f2b855 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2006-03-21 Edward Hervey + + * ext/ogg/gstoggdemux.c: (gst_ogg_pad_dispose): + * gst/playback/gstplaybin.c: (handoff): + * gst/playback/gststreamselector.c: + (gst_stream_selector_set_property): + gcc 4.1 unreferenced pointer fixes. + * sys/ximage/ximagesink.c: (gst_ximagesink_ximage_put): + * sys/xvimage/xvimagesink.c: (gst_xvimagesink_xvimage_put): + gst_buffer_ref() now takes a GstBuffer*. + 2006-03-20 Julien MOUTTE * sys/xvimage/xvimagesink.c: diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c index a1628ef..43ca679 100644 --- a/ext/ogg/gstoggdemux.c +++ b/ext/ogg/gstoggdemux.c @@ -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; diff --git a/gst/playback/gstplaybin.c b/gst/playback/gstplaybin.c index f89dc67..53f8af0 100644 --- a/gst/playback/gstplaybin.c +++ b/gst/playback/gstplaybin.c @@ -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, diff --git a/gst/playback/gststreamselector.c b/gst/playback/gststreamselector.c index 11d1b56..3923e6d 100644 --- a/gst/playback/gststreamselector.c +++ b/gst/playback/gststreamselector.c @@ -181,6 +181,7 @@ gst_stream_selector_set_property (GObject * object, guint prop_id, 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,8 +202,8 @@ gst_stream_selector_set_property (GObject * object, guint prop_id, } #endif - gst_object_replace ((GstObject **) (&sel->active_sinkpad), - GST_OBJECT_CAST (pad)); + active_pad_p = &sel->active_sinkpad; + gst_object_replace ((GstObject **) active_pad_p, GST_OBJECT_CAST (pad)); if (pad) gst_object_unref (pad); diff --git a/sys/ximage/ximagesink.c b/sys/ximage/ximagesink.c index cc2fbdd..cea4edb 100644 --- a/sys/ximage/ximagesink.c +++ b/sys/ximage/ximagesink.c @@ -606,7 +606,8 @@ gst_ximagesink_ximage_put (GstXImageSink * ximagesink, GstXImageBuffer * ximage) 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 */ diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index 88fcb5a..c0e8c40 100644 --- a/sys/xvimage/xvimagesink.c +++ b/sys/xvimage/xvimagesink.c @@ -635,7 +635,8 @@ gst_xvimagesink_xvimage_put (GstXvImageSink * xvimagesink, 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 */ -- 2.7.4