From 48c8cc338c561352e531cd8ccdbfe8b19b281473 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:31:41 +0200 Subject: Fixed using uninitialized data --HG-- branch : point-release --- src/demuxers/demux_avi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c index 100828bd2..02c242137 100644 --- a/src/demuxers/demux_avi.c +++ b/src/demuxers/demux_avi.c @@ -1712,7 +1712,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); -- cgit v1.2.3 From d09162d992bcda8ee38cb5c0b13557e395876c64 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:33:23 +0200 Subject: Fixed matroska header compression when using lacing (ex. multiple audio frames in one block) --HG-- branch : point-release --- src/demuxers/demux_matroska.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 3d1935587..ff2658a0c 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, -- cgit v1.2.3 From 3298dcdbed459629be8717d246465a0d145232c1 Mon Sep 17 00:00:00 2001 From: Petri Hintukainen Date: Mon, 16 Jan 2012 22:38:14 +0200 Subject: Fixed using uninitialized data --HG-- branch : point-release --- src/demuxers/asfheader.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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; -- cgit v1.2.3