From a6c45e0b760826ef54a9b36366544709c88c4874 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Sat, 8 May 2004 18:27:11 +0000 Subject: [PATCH] gst/gstpad.c: really reduce the set of caps Original commit message from CVS: * gst/gstpad.c: (gst_pad_proxy_fixate): really reduce the set of caps --- ChangeLog | 5 +++++ gst/gstpad.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 3ee558ffbf..bf4ad74db1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-05-08 Benjamin Otte + + * gst/gstpad.c: (gst_pad_proxy_fixate): + really reduce the set of caps + 2004-05-08 Benjamin Otte * tests/Makefile.am: diff --git a/gst/gstpad.c b/gst/gstpad.c index c4fc02fdea..46d9f05ebe 100644 --- a/gst/gstpad.c +++ b/gst/gstpad.c @@ -2408,7 +2408,7 @@ gst_pad_proxy_fixate (GstPad * pad, const GstCaps * caps) if (otherpad != pad) { othercaps = gst_pad_get_negotiated_caps (otherpad); - if (othercaps) { + if (othercaps && !gst_caps_is_subset (caps, othercaps)) { GstCaps *icaps; icaps = gst_caps_intersect (othercaps, caps);