diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/asfheader.c | 4 | ||||
| -rw-r--r-- | src/demuxers/demux_avi.c | 2 | ||||
| -rw-r--r-- | src/demuxers/demux_matroska.c | 7 |
3 files changed, 10 insertions, 3 deletions
diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c index 7a1397d73..5b309b76b 100644 --- a/src/demuxers/asfheader.c +++ b/src/demuxers/asfheader.c @@ -358,7 +358,7 @@ exit_error: 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 @@ static int asf_header_parse_metadata(asf_header_t *header_pub, uint8_t *buffer, 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;
diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index f4c9357fa..79bfc9f12 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -1708,7 +1708,7 @@ static int demux_avi_next_streaming (demux_avi_t *this, int decoder_flags) { 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); diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index deef0b3b6..242293502 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -2049,6 +2049,13 @@ static int parse_block (demux_matroska_t *this, size_t block_size, } /* 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, |