From d5f50856772f204c22ab1a8d07df3ab87c55a820 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Fri, 23 Jul 2004 17:40:16 +0000 Subject: [PATCH] gst/audioconvert/gstaudioconvert.c: don't enfore negotiation from source side, it breaks sinesrc ! audioconvert ! oss... Original commit message from CVS: * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link): don't enfore negotiation from source side, it breaks sinesrc ! audioconvert ! osssink --- ChangeLog | 6 ++++++ gst/audioconvert/gstaudioconvert.c | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8a66fdcad3..48c335ff3e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-07-23 Benjamin Otte + + * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link): + don't enfore negotiation from source side, it breaks + sinesrc ! audioconvert ! osssink + 2004-07-22 David Schleef * gst/typefind/gsttypefindfunctions.c: (plugin_init): Add typefind diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 8c100669cb..8ce1f6f1cd 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -385,10 +385,6 @@ gst_audio_convert_link (GstPad * pad, const GstCaps * caps) this = GST_AUDIO_CONVERT (GST_OBJECT_PARENT (pad)); otherpad = (pad == this->src ? this->sink : this->src); - /* negotiate sinkpad first */ - if (pad == this->src && !gst_pad_is_negotiated (this->sink)) - return GST_PAD_LINK_DELAYED; - if (!gst_audio_convert_parse_caps (caps, &ac_caps)) return GST_PAD_LINK_REFUSED;