diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2007-06-09 19:41:52 +0400 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2007-06-09 19:41:52 +0400 |
commit | f2fa0a91a6f96f5d0da3a7e78faa37cd9144c987 (patch) | |
tree | 4465cb8062b7fcbdccc0f9d80ef06003ab8f6ec1 | |
parent | e05417a077e8d85cafe68bd215c6b0fd133b0022 (diff) |
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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | ext/wavpack/gstwavpackenc.c | 5 |
2 files changed, 7 insertions, 4 deletions
@@ -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 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), |