summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--gst/law/alaw-decode.c3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d34bb79c..d1aa4f5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-06-02 Edward Hervey <edward@fluendo.com>
+ * gst/law/alaw-decode.c: (alawdec_getcaps):
+ Trying to get items from an ANY or EMPTY caps is ... stupid.
+
+2006-06-02 Edward Hervey <edward@fluendo.com>
+
* ext/dv/gstdvdec.c: (gst_dvdec_init), (gst_dvdec_sink_event),
(gst_dvdec_chain), (gst_dvdec_change_state):
* ext/dv/gstdvdec.h:
diff --git a/gst/law/alaw-decode.c b/gst/law/alaw-decode.c
index 294406b7..23ecc2b3 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;