From ab8c061685e6ae1955d22971f9b924dd890abaed Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Fri, 2 Jun 2006 15:02:54 +0000 Subject: [PATCH] gst/law/alaw-decode.c: Trying to get items from an ANY or EMPTY caps is ... stupid. Original commit message from CVS: * gst/law/alaw-decode.c: (alawdec_getcaps): Trying to get items from an ANY or EMPTY caps is ... stupid. --- ChangeLog | 5 +++++ gst/law/alaw-decode.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d34bb79c95..d1aa4f5e0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-02 Edward Hervey + + * gst/law/alaw-decode.c: (alawdec_getcaps): + Trying to get items from an ANY or EMPTY caps is ... stupid. + 2006-06-02 Edward Hervey * ext/dv/gstdvdec.c: (gst_dvdec_init), (gst_dvdec_sink_event), diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c index 294406b76d..23ecc2b36f 100644 --- a/gst/law/alaw-decode.c +++ b/gst/law/alaw-decode.c @@ -90,7 +90,8 @@ alawdec_getcaps (GstPad * pad) } /* now intersect rate and channels from peer caps */ othercaps = gst_pad_peer_get_caps (otherpad); - if (othercaps) { + if (othercaps && (!gst_caps_is_empty (othercaps)) + && (!gst_caps_is_any (othercaps))) { GstStructure *structure; const GValue *orate, *ochans; const GValue *rate, *chans;