summaryrefslogtreecommitdiff
path: root/libs
diff options
context:
space:
mode:
authorWim Taymans <wim.taymans@gmail.com>2008-11-24 15:27:55 +0000
committerWim Taymans <wim.taymans@gmail.com>2008-11-24 15:27:55 +0000
commitc577a143b9917ec799126268406e36ba9be4a79c (patch)
tree0c5bee863be5e6ccca8d217d61d341971437e18d /libs
parentaa1dfbb00449684c8cc53f083dc5ab5124a354e8 (diff)
libs/gst/base/gstbasetransform.c: Revert quick accepcaps attempt, it's not fully equivalent to the old behaviour and ...
Original commit message from CVS: * libs/gst/base/gstbasetransform.c: (gst_base_transform_acceptcaps): Revert quick accepcaps attempt, it's not fully equivalent to the old behaviour and thus causes regressions.
Diffstat (limited to 'libs')
-rw-r--r--libs/gst/base/gstbasetransform.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 140a3fe912..f9c36e9963 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -979,9 +979,12 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
trans = GST_BASE_TRANSFORM (gst_pad_get_parent (pad));
otherpad = (pad == trans->srcpad) ? trans->sinkpad : trans->srcpad;
+#if 0
/* we need fixed caps for the check, fall back to the default implementation
* if we don't */
- if (!gst_caps_is_fixed (caps)) {
+ if (!gst_caps_is_fixed (caps))
+#endif
+ {
GstCaps *allowed, *intersect;
GST_DEBUG_OBJECT (pad, "non fixed accept caps %" GST_PTR_FORMAT, caps);
@@ -1003,7 +1006,9 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
if (!ret)
goto no_transform_possible;
- } else {
+ }
+#if 0
+ else {
GST_DEBUG_OBJECT (pad, "accept caps %" GST_PTR_FORMAT, caps);
/* find best possible caps for the other pad as a way to see if we can
@@ -1014,6 +1019,7 @@ gst_base_transform_acceptcaps (GstPad * pad, GstCaps * caps)
GST_DEBUG_OBJECT (pad, "we can transform to %" GST_PTR_FORMAT, othercaps);
}
+#endif
done:
if (othercaps)