gst/asfdemux/gstasfdemux.c: Skip chunks for unknown streams properly. Fixes broken...

Original commit message from CVS:
* gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_chunk):
Skip chunks for unknown streams properly. Fixes broken sound
and/or video for files that have additional streams that
we don't recognise yet (e.g. if they are embedded in extended
stream properties). Partly fixes #343763.

diff --git a/ChangeLog b/ChangeLog
index 5e9821bfdc500aca1fcea4a0221610a1bdfcf60f..14db05a91425906e014a07efdf2260d39243979e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-07-08  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_chunk):
+         Skip chunks for unknown streams properly. Fixes broken sound
+         and/or video for files that have additional streams that
+         we don't recognise yet (e.g. if they are embedded in extended
+         stream properties). Partly fixes #343763.
+
 2006-07-07  Tim-Philipp Müller  <tim at centricular dot net>
 
        * gst/asfdemux/asfheaders.c:

diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 9a40e53886a3df6ad2ae86c0fc7f62ef214ecd40..5e36098386e14a6a79a9461ed74d00b602c56460 100644 (file)
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -1869,6 +1869,8 @@ gst_asf_demux_process_chunk (GstASFDemux * demux,
   stream = gst_asf_demux_get_stream (demux, segment_info->stream_number);
   if (stream == NULL) {
     GST_WARNING ("invalid stream number %d", segment_info->stream_number);
+    if (!gst_asf_demux_skip_bytes (segment_info->chunk_size, p_data, p_size))
+      ret = ASF_FLOW_NEED_MORE_DATA;
     goto done;
   }