summaryrefslogtreecommitdiff
path: root/gst/dvbsuboverlay
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@collabora.co.uk>2011-11-16 17:28:10 +0100
committerWim Taymans <wim.taymans@collabora.co.uk>2011-11-16 17:30:38 +0100
commit6d92ecac757a4e0a9f9f63805b43e26a92bb4160 (patch)
treeba958cd2fae6477ca9875138ff1516c9848a25d8 /gst/dvbsuboverlay
parent3c993f1c4afc4c874108404158afdafac3ad0d99 (diff)
downloadgstreamer-plugins-bad-6d92ecac757a4e0a9f9f63805b43e26a92bb4160.tar.gz
add parent to query function
Diffstat (limited to 'gst/dvbsuboverlay')
-rw-r--r--gst/dvbsuboverlay/gstdvbsuboverlay.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/gst/dvbsuboverlay/gstdvbsuboverlay.c b/gst/dvbsuboverlay/gstdvbsuboverlay.c
index 346a31223..06879d538 100644
--- a/gst/dvbsuboverlay/gstdvbsuboverlay.c
+++ b/gst/dvbsuboverlay/gstdvbsuboverlay.c
@@ -108,8 +108,10 @@ static gboolean gst_dvbsub_overlay_event_src (GstPad * pad, GstEvent * event);
static void new_dvb_subtitles_cb (DvbSub * dvb_sub, DVBSubtitles * subs,
gpointer user_data);
-static gboolean gst_dvbsub_overlay_query_video (GstPad * pad, GstQuery * query);
-static gboolean gst_dvbsub_overlay_query_src (GstPad * pad, GstQuery * query);
+static gboolean gst_dvbsub_overlay_query_video (GstPad * pad,
+ GstObject * parent, GstQuery * query);
+static gboolean gst_dvbsub_overlay_query_src (GstPad * pad, GstObject * parent,
+ GstQuery * query);
/* initialize the plugin's class */
static void
@@ -324,9 +326,10 @@ gst_dvbsub_overlay_change_state (GstElement * element,
}
static gboolean
-gst_dvbsub_overlay_query_src (GstPad * pad, GstQuery * query)
+gst_dvbsub_overlay_query_src (GstPad * pad, GstObject * parent,
+ GstQuery * query)
{
- GstDVBSubOverlay *render = GST_DVBSUB_OVERLAY (gst_pad_get_parent (pad));
+ GstDVBSubOverlay *render = GST_DVBSUB_OVERLAY (parent);
gboolean ret;
switch (GST_QUERY_TYPE (query)) {
@@ -346,7 +349,6 @@ gst_dvbsub_overlay_query_src (GstPad * pad, GstQuery * query)
break;
}
- gst_object_unref (render);
return ret;
}
@@ -926,9 +928,9 @@ missing_timestamp:
}
static gboolean
-gst_dvbsub_overlay_query_video (GstPad * pad, GstQuery * query)
+gst_dvbsub_overlay_query_video (GstPad * pad, GstObject * parent,
+ GstQuery * query)
{
- GstDVBSubOverlay *render = GST_DVBSUB_OVERLAY (gst_pad_get_parent (pad));
gboolean ret;
switch (GST_QUERY_TYPE (query)) {
@@ -944,11 +946,10 @@ gst_dvbsub_overlay_query_video (GstPad * pad, GstQuery * query)
break;
}
default:
- ret = gst_pad_query_default (pad, query);
+ ret = gst_pad_query_default (pad, parent, query);
break;
}
- gst_object_unref (render);
return ret;
}