summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2006-03-21 14:53:36 +0000
committerEdward Hervey <bilboed@bilboed.com>2006-03-21 14:53:36 +0000
commit0186335dd2c27f77180920d010fa4de1eafc73fa (patch)
tree5df0469659677c8d027413bf1f6aaad0a2b3e659
parent0465903a85e3865eb064a79d19d1984b4e5da23f (diff)
gst/: gcc 4.1 unreferenced pointer fixes.
Original commit message from CVS: * gst/apetag/gsttagdemux.c: (gst_tag_demux_reset): * gst/id3demux/gstid3demux.c: (gst_id3demux_reset): * gst/wavparse/gstwavparse.c: (gst_wavparse_create_sourcepad), (gst_wavparse_stream_headers), (gst_wavparse_send_event), (gst_wavparse_change_state): gcc 4.1 unreferenced pointer fixes.
-rw-r--r--ChangeLog9
-rw-r--r--gst/apetag/gsttagdemux.c7
-rw-r--r--gst/id3demux/gstid3demux.c7
-rw-r--r--gst/wavparse/gstwavparse.c15
4 files changed, 30 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 43d2b7ed..467c52f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-03-21 Edward Hervey <edward@fluendo.com>
+
+ * gst/apetag/gsttagdemux.c: (gst_tag_demux_reset):
+ * gst/id3demux/gstid3demux.c: (gst_id3demux_reset):
+ * gst/wavparse/gstwavparse.c: (gst_wavparse_create_sourcepad),
+ (gst_wavparse_stream_headers), (gst_wavparse_send_event),
+ (gst_wavparse_change_state):
+ gcc 4.1 unreferenced pointer fixes.
+
2006-03-21 Tim-Philipp Müller <tim at centricular dot net>
Patch by: Tommi Myöhänen <ext-tommi dot myohanen at nokia dot com>
diff --git a/gst/apetag/gsttagdemux.c b/gst/apetag/gsttagdemux.c
index b5d9cc32..2c42b599 100644
--- a/gst/apetag/gsttagdemux.c
+++ b/gst/apetag/gsttagdemux.c
@@ -214,14 +214,17 @@ gst_tag_demux_class_init (gpointer klass, gpointer d)
static void
gst_tag_demux_reset (GstTagDemux * tagdemux)
{
+ GstBuffer **buffer_p = &tagdemux->priv->collect;
+ GstCaps **caps_p = &tagdemux->priv->src_caps;
+
tagdemux->priv->strip_start = 0;
tagdemux->priv->strip_end = 0;
tagdemux->priv->upstream_size = -1;
tagdemux->priv->state = GST_TAG_DEMUX_READ_START_TAG;
tagdemux->priv->send_tag_event = FALSE;
- gst_buffer_replace (&(tagdemux->priv->collect), NULL);
- gst_caps_replace (&(tagdemux->priv->src_caps), NULL);
+ gst_buffer_replace (buffer_p, NULL);
+ gst_caps_replace (caps_p, NULL);
gst_tag_demux_remove_srcpad (tagdemux);
diff --git a/gst/id3demux/gstid3demux.c b/gst/id3demux/gstid3demux.c
index 6b7f073e..3d7ee5ba 100644
--- a/gst/id3demux/gstid3demux.c
+++ b/gst/id3demux/gstid3demux.c
@@ -182,14 +182,17 @@ gst_id3demux_class_init (GstID3DemuxClass * klass)
static void
gst_id3demux_reset (GstID3Demux * id3demux)
{
+ GstBuffer **buffer_p = &id3demux->collect;
+ GstCaps **caps_p = &id3demux->src_caps;
+
id3demux->strip_start = 0;
id3demux->strip_end = 0;
id3demux->upstream_size = -1;
id3demux->state = GST_ID3DEMUX_READID3V2;
id3demux->send_tag_event = FALSE;
- gst_buffer_replace (&(id3demux->collect), NULL);
- gst_caps_replace (&(id3demux->src_caps), NULL);
+ gst_buffer_replace (buffer_p, NULL);
+ gst_caps_replace (caps_p, NULL);
gst_id3demux_remove_srcpad (id3demux);
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 71a0756e..7e57ed3b 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -871,6 +871,7 @@ gst_wavparse_stream_headers (GstWavParse * wav)
GstCaps *caps;
gint64 duration;
gchar *codec_name = NULL;
+ GstEvent **event_p;
/* The header start with a 'fmt ' tag */
if ((res = gst_riff_read_chunk (GST_ELEMENT (wav), wav->sinkpad,
@@ -987,7 +988,8 @@ gst_wavparse_stream_headers (GstWavParse * wav)
* the right newsegment event downstream. */
gst_wavparse_perform_seek (wav, wav->seek_event);
/* remove pending event */
- gst_event_replace (&wav->seek_event, NULL);
+ event_p = &wav->seek_event;
+ gst_event_replace (event_p, NULL);
return GST_FLOW_OK;
@@ -1066,6 +1068,7 @@ gst_wavparse_send_event (GstElement * element, GstEvent * event)
{
GstWavParse *wav = GST_WAVPARSE (element);
gboolean res = FALSE;
+ GstEvent **event_p;
switch (GST_EVENT_TYPE (event)) {
case GST_EVENT_SEEK:
@@ -1075,7 +1078,8 @@ gst_wavparse_send_event (GstElement * element, GstEvent * event)
} else {
GST_DEBUG_OBJECT (wav, "queuing seek for later");
- gst_event_replace (&wav->seek_event, event);
+ event_p = &wav->seek_event;
+ gst_event_replace (event_p, event);
/* we always return true */
res = TRUE;
@@ -1517,10 +1521,13 @@ gst_wavparse_change_state (GstElement * element, GstStateChange transition)
switch (transition) {
case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
break;
- case GST_STATE_CHANGE_PAUSED_TO_READY:
+ case GST_STATE_CHANGE_PAUSED_TO_READY:{
+ GstEvent **event_p = &wav->seek_event;
+
gst_wavparse_destroy_sourcepad (wav);
- gst_event_replace (&wav->seek_event, NULL);
+ gst_event_replace (event_p, NULL);
gst_wavparse_reset (wav);
+ }
break;
case GST_STATE_CHANGE_READY_TO_NULL:
break;