From 96006aded8a6bd8790c5f4b7ab1661dd847b54bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sun, 10 Oct 2010 18:35:54 +0200 Subject: [PATCH] xvimagesink: Make sure that the caps for upstream negotiation are simple caps Fixes bug #631774. --- sys/xvimage/xvimagesink.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/xvimage/xvimagesink.c b/sys/xvimage/xvimagesink.c index abf12ae8f3..aa53bcb554 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)) {