summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2010-10-10 18:35:54 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2010-10-10 18:35:54 +0200
commit96006aded8a6bd8790c5f4b7ab1661dd847b54bd (patch)
tree8e4f4b51d1c07026560bccb81e660c97bba89b44 /sys
parent50a6f26684305ac9dd78cfe01a64be92cb27237b (diff)
downloadgstreamer-plugins-base-96006aded8a6bd8790c5f4b7ab1661dd847b54bd.tar.gz
xvimagesink: Make sure that the caps for upstream negotiation are simple caps
Fixes bug #631774.
Diffstat (limited to 'sys')
-rw-r--r--sys/xvimage/xvimagesink.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c
index abf12ae8f..aa53bcb55 100644
--- a/sys/xvimage/xvimagesink.c
+++ b/sys/xvimage/xvimagesink.c
@@ -2536,9 +2536,6 @@ gst_xvimagesink_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
/* Check the caps against our xcontext */
intersection = gst_caps_intersect (xvimagesink->xcontext->caps, caps);
- /* Ensure the returned caps are fixed */
- gst_caps_truncate (intersection);
-
GST_DEBUG_OBJECT (xvimagesink, "intersection in buffer alloc returned %"
GST_PTR_FORMAT, intersection);
@@ -2606,6 +2603,9 @@ gst_xvimagesink_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
goto incompatible;
}
+ /* Ensure the returned caps are fixed */
+ gst_caps_truncate (intersection);
+
GST_DEBUG_OBJECT (xvimagesink, "allocating a buffer with caps %"
GST_PTR_FORMAT, intersection);
if (gst_caps_is_equal (intersection, caps)) {