[xine-cvs] HG: xine-lib: Merge

[Petri H. <phi...@us...>]

# HG changeset patch
# User Petri Hintukainen <phi...@us...>
# Date 1326746346 -7200
# Node ID 4ac9cf0ca47e6e4eb476f6201679fadfe6210abb
# Branch  default
# Parent  8eed8e917565a529188fb1e9a1260274d0734a7e
# Parent  f1cfd92441674661e9dd693e3886bd69f8430976
Merge

diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c
--- a/src/demuxers/asfheader.c
+++ b/src/demuxers/asfheader.c
@@ -358,7 +358,7 @@
 static int asf_header_parse_stream_extended_properties(asf_header_t *header, uint8_t *buffer, int buffer_len) {
   asf_reader_t reader;
   uint32_t flags = 0;
-  uint16_t stream_number;
+  uint16_t stream_number = 0;
   int i;
   int stream_id;
   asf_stream_extension_t *asf_stream_extension;
@@ -532,7 +532,7 @@
 
   for (i = 0; i < records_count; i++)
   {
-    uint16_t index, stream, name_len = 0, data_type;
+    uint16_t index, stream = 0, name_len = 0, data_type;
     uint32_t data_len = 0;
     int stream_id;
 
 --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.c
@@ -1708,7 +1708,7 @@
   int64_t        audio_pts, video_pts;
   off_t          current_pos;
   int            left;
-  int            header, chunk_len, audio_stream;
+  int            header, chunk_len = 0, audio_stream;
   avi_audio_t   *audio;
 
   current_pos = this->input->get_current_pos(this->input);
 --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c
--- a/src/demuxers/demux_matroska.c
+++ b/src/demuxers/demux_matroska.c
@@ -2049,6 +2049,13 @@
     }
     /* send each frame to the decoder */
     for (i = 0; i <= lace_num; i++) {
+
+      if (headers_len) {
+        data -= headers_len;
+        xine_fast_memcpy(data, track->compress_settings, headers_len);
+        frame[i] += headers_len;
+      }
+
       if (track->handle_content != NULL) {
         track->handle_content((demux_plugin_t *)this, track,
                                decoder_flags,