mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-19 23:06:49 +00:00
xvimagesink: Make sure that the caps for upstream negotiation are simple caps
Fixes bug #631774.
This commit is contained in:
parent
50a6f26684
commit
96006aded8
1 changed files with 3 additions and 3 deletions
|
@ -2536,9 +2536,6 @@ gst_xvimagesink_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
|
||||||
/* Check the caps against our xcontext */
|
/* Check the caps against our xcontext */
|
||||||
intersection = gst_caps_intersect (xvimagesink->xcontext->caps, caps);
|
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_DEBUG_OBJECT (xvimagesink, "intersection in buffer alloc returned %"
|
||||||
GST_PTR_FORMAT, intersection);
|
GST_PTR_FORMAT, intersection);
|
||||||
|
|
||||||
|
@ -2606,6 +2603,9 @@ gst_xvimagesink_buffer_alloc (GstBaseSink * bsink, guint64 offset, guint size,
|
||||||
goto incompatible;
|
goto incompatible;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Ensure the returned caps are fixed */
|
||||||
|
gst_caps_truncate (intersection);
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (xvimagesink, "allocating a buffer with caps %"
|
GST_DEBUG_OBJECT (xvimagesink, "allocating a buffer with caps %"
|
||||||
GST_PTR_FORMAT, intersection);
|
GST_PTR_FORMAT, intersection);
|
||||||
if (gst_caps_is_equal (intersection, caps)) {
|
if (gst_caps_is_equal (intersection, caps)) {
|
||||||
|
|
Loading…
Reference in a new issue