From ca18e2eed7524029b768ff98fc75bd9e5ffdf636 Mon Sep 17 00:00:00 2001 From: Zaheer Abbas Merali Date: Thu, 12 Aug 2004 16:44:14 +0000 Subject: [PATCH] ext/lame/gstlame.c: revert previous fix Original commit message from CVS: 2004-08-12 Zaheer Abbas Merali * ext/lame/gstlame.c: (gst_lame_src_link): revert previous fix --- ChangeLog | 5 +++++ ext/lame/gstlame.c | 12 +----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 53be3930f7..49fe5d5f02 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-08-12 Zaheer Abbas Merali + + * ext/lame/gstlame.c: (gst_lame_src_link): + revert previous fix + 2004-08-12 Johan Dahlin * sys/v4l/gstv4lelement.c (gst_v4l_iface_supported): Remove bogus diff --git a/ext/lame/gstlame.c b/ext/lame/gstlame.c index 29d260abfa..ca06874640 100644 --- a/ext/lame/gstlame.c +++ b/ext/lame/gstlame.c @@ -353,7 +353,7 @@ gst_lame_src_link (GstPad * pad, const GstCaps * caps) GstLame *lame; gint out_samplerate; GstStructure *structure; - GstCaps *othercaps, *channelcaps, *ratecaps; + GstCaps *othercaps, *channelcaps; GstPadLinkReturn result; lame = GST_LAME (gst_pad_get_parent (pad)); @@ -363,16 +363,6 @@ gst_lame_src_link (GstPad * pad, const GstCaps * caps) !gst_structure_get_int (structure, "channels", &lame->num_channels)) g_return_val_if_reached (GST_PAD_LINK_REFUSED); - /* try sample rate */ - ratecaps = - gst_caps_new_simple ("audio/x-raw-int", - "channels", G_TYPE_INT, lame->num_channels, - "rate", G_TYPE_INT, out_samplerate, NULL); - result = gst_pad_try_set_caps (lame->srcpad, ratecaps); - gst_caps_free (ratecaps); - if (GST_PAD_LINK_FAILED (result)) - return result; - if (lame_set_out_samplerate (lame->lgf, out_samplerate) != 0) return GST_PAD_LINK_REFUSED;