aboutsummaryrefslogtreecommitdiff
path: root/docs/pwg
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2013-03-22 18:10:09 +0100
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2013-03-22 18:10:09 +0100
commite4f7e7387835f2d104054b356866aff3d409e3e0 (patch)
tree14da13804a8ea53eb86f19d46ec2cb335a29706f /docs/pwg
parent0dae307117a84152263d4c8b2c6aacf7e98a2f7c (diff)
Imported Upstream version 1.0.6upstream/1.0.6
Diffstat (limited to 'docs/pwg')
-rw-r--r--docs/pwg/advanced-negotiation.xml8
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/pwg/advanced-negotiation.xml b/docs/pwg/advanced-negotiation.xml
index bc0ecbb..e6ec035 100644
--- a/docs/pwg/advanced-negotiation.xml
+++ b/docs/pwg/advanced-negotiation.xml
@@ -537,14 +537,14 @@ gst_my_filter_query (GstPad *pad, GstObject * parent, GstQuery * query)
case GST_QUERY_CAPS
{
GstPad *otherpad;
- GstCaps *temp, *caps, *filter, *tcaps;
+ GstCaps *temp, *caps, *filt, *tcaps;
gint i;
otherpad = (pad == filter->srcpad) ? filter->sinkpad :
filter->srcpad;
caps = gst_pad_get_allowed_caps (otherpad);
- gst_query_parse_caps (query, &filter);
+ gst_query_parse_caps (query, &filt);
/* We support *any* samplerate, indifferent from the samplerate
* supported by the linked elements on both sides. */
@@ -564,8 +564,8 @@ gst_my_filter_query (GstPad *pad, GstObject * parent, GstQuery * query)
caps = temp;
}
/* filter against the query filter when needed */
- if (filter) {
- temp = gst_caps_intersect (caps, filter);
+ if (filt) {
+ temp = gst_caps_intersect (caps, filt);
gst_caps_unref (caps);
caps = temp;
}