From 26cc5e87686376fa388fbc463a22d1b3d0ce1f0d Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Tue, 20 Apr 2004 15:51:48 +0000 Subject: [PATCH] ext/mad/gstid3tag.c: remove leftover g_print Original commit message from CVS: * ext/mad/gstid3tag.c: (gst_id3_tag_init): remove leftover g_print * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link): don't try setting only a subset of the caps. We don't want to kill autoplugging on purpose --- ChangeLog | 8 ++++++++ gst/audioconvert/gstaudioconvert.c | 7 ------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 649fdfc4fc..859a5a99bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-04-20 Benjamin Otte + + * ext/mad/gstid3tag.c: (gst_id3_tag_init): + remove leftover g_print + * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_link): + don't try setting only a subset of the caps. We don't want to kill + autoplugging on purpose + 2004-04-20 Thomas Vander Stichele * sys/ximage/ximagesink.c: (plugin_init): diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 6ca9c1c55a..84af4b6e18 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -373,13 +373,6 @@ gst_audio_convert_link (GstPad * pad, const GstCaps * caps) if (!gst_audio_convert_parse_caps (caps, &ac_caps)) return GST_PAD_LINK_REFUSED; - /* try setting our caps on the other side first */ - if (gst_pad_try_set_caps (otherpad, caps) >= GST_PAD_LINK_OK) { - this->srccaps = ac_caps; - this->sinkcaps = ac_caps; - return GST_PAD_LINK_OK; - } - /* ok, not those - try setting "any" caps */ othercaps = gst_pad_get_allowed_caps (otherpad); for (i = 0; i < gst_caps_get_size (othercaps); i++) {