From 6dc97edc2f34f57e9715b371acc27990ae741bda Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 27 Oct 2006 16:31:15 +0000 Subject: [PATCH] gst/gstghostpad.c: Make acceptcaps return TRUE when we don't have a target, just like setcaps does. Original commit message from CVS: * gst/gstghostpad.c: (gst_proxy_pad_do_acceptcaps), (gst_ghost_pad_new_full): Make acceptcaps return TRUE when we don't have a target, just like setcaps does. --- ChangeLog | 7 +++++++ gst/gstghostpad.c | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 644180b..233cfe8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2006-10-27 Wim Taymans + * gst/gstghostpad.c: (gst_proxy_pad_do_acceptcaps), + (gst_ghost_pad_new_full): + Make acceptcaps return TRUE when we don't have a target, just like + setcaps does. + +2006-10-27 Wim Taymans + * libs/gst/base/gstbasetransform.c: (gst_base_transform_chain): Revert previous commit, 0 sized buffers are allowed. Reopens #363095. diff --git a/gst/gstghostpad.c b/gst/gstghostpad.c index 90af4c9..6035b31 100644 --- a/gst/gstghostpad.c +++ b/gst/gstghostpad.c @@ -265,11 +265,15 @@ static gboolean gst_proxy_pad_do_acceptcaps (GstPad * pad, GstCaps * caps) { GstPad *target = gst_proxy_pad_get_target (pad); - gboolean res = FALSE; + gboolean res; if (target) { res = gst_pad_accept_caps (target, caps); gst_object_unref (target); + } else { + /* We don't have a target, we return TRUE and we assume that any future + * target will be able to deal with any configured caps. */ + res = TRUE; } return res; @@ -827,6 +831,7 @@ gst_ghost_pad_new_full (const gchar * name, GstPadDirection dir, g_object_new (GST_TYPE_PROXY_PAD, "name", NULL, "direction", otherdir, NULL); } + /* GST_PAD_UNSET_FLUSHING (internal); */ /* Set directional padfunctions for internal pad */ if (dir == GST_PAD_SRC) { -- 2.7.4