From f2fa0a91a6f96f5d0da3a7e78faa37cd9144c987 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Sat, 9 Jun 2007 15:41:52 +0000 Subject: ext/wavpack/gstwavpackenc.c: Remove workaround for bug #421543. This is fixed in core 0.10.13 and not necessary anymo... Original commit message from CVS: * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_sink_set_caps): Remove workaround for bug #421543. This is fixed in core 0.10.13 and not necessary anymore as we need at least that core version. --- ChangeLog | 6 ++++++ ext/wavpack/gstwavpackenc.c | 5 +---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b11b2bf2..b4c21a8a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-06-09 Sebastian Dröge + + * ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_sink_set_caps): + Remove workaround for bug #421543. This is fixed in core 0.10.13 and + not necessary anymore as we need at least that core version. + 2007-06-09 Sebastian Dröge * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset), diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c index ad5e8adaa..5562ea769 100644 --- a/ext/wavpack/gstwavpackenc.c +++ b/ext/wavpack/gstwavpackenc.c @@ -375,10 +375,7 @@ gst_wavpack_enc_sink_set_caps (GstPad * pad, GstCaps * caps) GstWavpackEnc *enc = GST_WAVPACK_ENC (gst_pad_get_parent (pad)); GstStructure *structure = gst_caps_get_structure (caps, 0); - /* FIXME: Workaround for bug #421543: calls gst_pad_accept_caps() */ - /* check caps and put relevant parts into our object attributes */ - if (!gst_pad_accept_caps (pad, caps) || - !gst_structure_get_int (structure, "channels", &enc->channels) || + if (!gst_structure_get_int (structure, "channels", &enc->channels) || !gst_structure_get_int (structure, "rate", &enc->samplerate) || !gst_structure_get_int (structure, "depth", &enc->depth)) { GST_ELEMENT_ERROR (enc, LIBRARY, INIT, (NULL), -- cgit v1.2.3