mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-04-10 10:04:23 +00:00
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*.
This commit is contained in:
parent
ec0e8a27f1
commit
8f194ed848
6 changed files with 29 additions and 8 deletions
11
ChangeLog
11
ChangeLog
|
@ -1,3 +1,14 @@
|
|||
2006-03-21 Edward Hervey <edward@fluendo.com>
|
||||
|
||||
* 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 <julien@moutte.net>
|
||||
|
||||
* sys/xvimage/xvimagesink.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;
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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);
|
||||
|
||||
|
|
|
@ -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 */
|
||||
|
|
|
@ -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 */
|
||||
|
|
Loading…
Reference in a new issue