diff options
| author | Edward Hervey <bilboed@bilboed.com> | 2005-12-19 15:19:44 +0000 |
|---|---|---|
| committer | Edward Hervey <bilboed@bilboed.com> | 2005-12-19 15:19:44 +0000 |
| commit | 95d65be727e4e64070c249641bd20d1c24070069 (patch) | |
| tree | c5569e020fec5293994f882fb8abad4d02e3cb7c /ext/wavpack | |
| parent | ac8b1191d4c9db98ca500809e989f0cc75e94187 (diff) | |
| download | gst-plugins-bad-95d65be727e4e64070c249641bd20d1c24070069.tar.gz gst-plugins-bad-95d65be727e4e64070c249641bd20d1c24070069.tar.bz2 gst-plugins-bad-95d65be727e4e64070c249641bd20d1c24070069.zip | |
ext/swfdec/gstswfdec.c: Add debugging category and return GstFlowReturn in the right places
Original commit message from CVS:
* ext/swfdec/gstswfdec.c: (gst_swfdec_class_init),
(gst_swfdec_chain), (gst_swfdec_render):
Add debugging category and return GstFlowReturn in the right places
* ext/wavpack/gstwavpackdec.c: (gst_wavpack_dec_link):
Get something from the peer pad once we've checked if there is a peer pad.
* gst/qtdemux/qtdemux.c: (gst_qtdemux_change_state),
(qtdemux_tree_get_child_by_type), (qtdemux_parse_trak),
(qtdemux_video_caps):
Couple of fixes
Diffstat (limited to 'ext/wavpack')
| -rw-r--r-- | ext/wavpack/gstwavpackdec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/wavpack/gstwavpackdec.c b/ext/wavpack/gstwavpackdec.c index f3f9d750..d8a4308e 100644 --- a/ext/wavpack/gstwavpackdec.c +++ b/ext/wavpack/gstwavpackdec.c @@ -83,13 +83,14 @@ static GstPadLinkReturn gst_wavpack_dec_link (GstPad * pad, GstPad * peer) { GstWavpackDec *wavpackdec = GST_WAVPACK_DEC (gst_pad_get_parent (pad)); - GstStructure *structure = gst_caps_get_structure (GST_PAD_CAPS (peer), 0); + GstStructure *structure; GstCaps *srccaps; gint bits; if (!gst_caps_is_fixed (GST_PAD_CAPS (peer))) return GST_PAD_LINK_REFUSED; + structure = gst_caps_get_structure (GST_PAD_CAPS (peer), 0); gst_structure_get_int (structure, "rate", (gint32 *) & wavpackdec->samplerate); gst_structure_get_int (structure, "channels", |