diff --git a/ChangeLog b/ChangeLog
index 4333e40744..ae084753dc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-17  Edward Hervey  <edward@fluendo.com>
+
+	* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_stream):
+	Do not error out on non-recognized streams. Ignore them and allow
+	playback of the other streams.
+
 2006-02-17  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/dvdlpcmdec/gstdvdlpcmdec.c: (gst_dvdlpcmdec_chain_dvd):
diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 7d6a1f5951..90137b8dd1 100644
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1075,9 +1075,9 @@ gst_asf_demux_process_stream (GstASFDemux * demux, guint8 ** p_data,
     }
 
     default:
-      GST_ELEMENT_ERROR (demux, STREAM, WRONG_TYPE, (NULL),
-          ("Unknown asf stream (id %08x)", (guint) stream_id));
-      return GST_FLOW_ERROR;
+      GST_WARNING_OBJECT (demux, "Unknown asf stream (id %08x)",
+          (guint) stream_id);
+      break;
   }
 
   return GST_FLOW_OK;