ext/wavpack/gstwavpackenc.c: Remove workaround for bug #421543. This is fixed in...

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.

diff --git a/ChangeLog b/ChangeLog
index 9b11b2b..b4c21a8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-06-09  Sebastian Dröge  <slomo@circular-chaos.org>
 
+       * 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  <slomo@circular-chaos.org>
+
        * ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_reset),
        (gst_wavpack_dec_chain):
        * ext/wavpack/gstwavpackdec.h:

diff --git a/ext/wavpack/gstwavpackenc.c b/ext/wavpack/gstwavpackenc.c
index ad5e8ad..5562ea7 100644 (file)
--- 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),