[gst-cvs] gstreamer: basetransform: Only use suggested caps in buffer allocation if a size was suggested too

[Sebastian Dröge]

Module: gstreamer
Branch: master
Commit: 743cde4b495ce41d0e9bf4613af35f087926305e
URL:    http://cgit.freedesktop.org/gstreamer/gstreamer/commit/?id=743cde4b495ce41d0e9bf4613af35f087926305e

Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Sat Jan 16 21:52:06 2010 +0100

basetransform: Only use suggested caps in buffer allocation if a size was suggested too

---

 libs/gst/base/gstbasetransform.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/libs/gst/base/gstbasetransform.c b/libs/gst/base/gstbasetransform.c
index 78ffc8d..a9de592 100644
--- a/libs/gst/base/gstbasetransform.c
+++ b/libs/gst/base/gstbasetransform.c
@@ -1550,7 +1550,8 @@ gst_base_transform_buffer_alloc (GstPad * pad, guint64 offset, guint size,
 
     /* if we have a suggestion, pretend we got these as input */
     GST_OBJECT_LOCK (pad);
-    if ((priv->sink_suggest && !gst_caps_is_equal (caps, priv->sink_suggest))) {
+    if ((priv->size_suggest && priv->sink_suggest
+            && !gst_caps_is_equal (caps, priv->sink_suggest))) {
       sink_suggest = gst_caps_ref (priv->sink_suggest);
       size_suggest = priv->size_suggest;
       GST_DEBUG_OBJECT (trans, "have suggestion %p %" GST_PTR_FORMAT " size %u",