From 356d5df6bc31057df6b676a294aadc40de82b1da Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Fri, 7 Mar 2008 15:48:56 +0000 Subject: Get rid of some "may be used uninitialised" warnings. --- src/demuxers/asfheader.c | 14 +++++++------- src/demuxers/demux_ogg.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/demuxers/asfheader.c b/src/demuxers/asfheader.c index eb74c0886..f95c68e41 100644 --- a/src/demuxers/asfheader.c +++ b/src/demuxers/asfheader.c @@ -399,7 +399,7 @@ static int asf_header_parse_stream_extended_properties(asf_header_t *header, uin if (asf_stream_extension->stream_name_count) { asf_stream_extension->stream_names = malloc (asf_stream_extension->stream_name_count * sizeof(void*)); for (i = 0; i < asf_stream_extension->stream_name_count; i++) { - uint16_t lang_index, length; + uint16_t lang_index, length = 0; asf_reader_get_16(&reader, &lang_index); asf_reader_get_16(&reader, &length); asf_stream_extension->stream_names[i] = (char*)asf_reader_get_bytes(&reader, length); /* store them */ @@ -411,7 +411,7 @@ static int asf_header_parse_stream_extended_properties(asf_header_t *header, uin for (i = 0; i < asf_stream_extension->payload_extension_system_count; i++) { GUID guid; uint16_t data_size; - uint32_t length; + uint32_t length = 0; asf_reader_get_guid(&reader, &guid); asf_reader_get_16(&reader, &data_size); asf_reader_get_32(&reader, &length); @@ -427,7 +427,7 @@ static int asf_header_parse_stream_extended_properties(asf_header_t *header, uin /* embeded stream properties */ if (asf_reader_get_size(&reader) >= 24) { GUID guid; - uint64_t object_length; + uint64_t object_length = 0; asf_reader_get_guid(&reader, &guid); asf_reader_get_64(&reader, &object_length); @@ -490,8 +490,8 @@ static int asf_header_parse_stream_bitrate_properties(asf_header_t *header_pub, lprintf (" bitrate count: %d\n", bitrate_count); for(i = 0; i < bitrate_count; i++) { - uint16_t flags; - uint32_t bitrate; + uint16_t flags = 0; + uint32_t bitrate = 0; int stream_number; uint8_t *bitrate_pointer; @@ -533,7 +533,7 @@ static int asf_header_parse_header_extension(asf_header_t *header, uint8_t *buff GUID guid; int object_id; - uint64_t object_length, object_data_length; + uint64_t object_length = 0, object_data_length; if (asf_reader_get_size(&reader) < 24) { printf("invalid buffer size\n"); @@ -644,7 +644,7 @@ asf_header_t *asf_header_new (uint8_t *buffer, int buffer_len) { GUID guid; int object_id; - uint64_t object_length, object_data_length; + uint64_t object_length = 0, object_data_length; if (asf_reader_get_size(&reader) < 24) { printf("invalid buffer size\n"); diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index dc867e5f1..175d61cd8 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -1194,7 +1194,7 @@ static void decode_theora_header (demux_ogg_t *this, const int stream_num, ogg_p static void decode_flac_header (demux_ogg_t *this, const int stream_num, ogg_packet *op) { xine_flac_metadata_header header; - xine_flac_streaminfo_block streaminfo; + xine_flac_streaminfo_block streaminfo = {}; buf_element_t *buf; xine_waveformatex wave; -- cgit v1.2.3