From 763bee172bf7dc4ac9bf27818e811c88abc85012 Mon Sep 17 00:00:00 2001 From: Josh Coalson Date: Thu, 8 Feb 2001 00:24:17 +0000 Subject: [PATCH] *** empty log message *** --- src/libFLAC/bitbuffer.c | 4 ++-- src/libFLAC/encoder_framing.c | 3 ++- src/libFLAC/stream_decoder.c | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/libFLAC/bitbuffer.c b/src/libFLAC/bitbuffer.c index 9c5a19c0..e6b9d466 100644 --- a/src/libFLAC/bitbuffer.c +++ b/src/libFLAC/bitbuffer.c @@ -1005,7 +1005,7 @@ bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, int64 *val, unsigned bi bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, bool (*read_callback)(byte buffer[], unsigned *bytes, void *client_data), void *client_data) { - uint32 lsbs, msbs = 0; + uint32 lsbs = 0, msbs = 0; unsigned bit, uval; assert(bb != 0); @@ -1036,7 +1036,7 @@ bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned pa bool FLAC__bitbuffer_read_golomb_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, bool (*read_callback)(byte buffer[], unsigned *bytes, void *client_data), void *client_data) { - uint32 lsbs, msbs = 0; + uint32 lsbs = 0, msbs = 0; unsigned bit, uval, k; assert(bb != 0); diff --git a/src/libFLAC/encoder_framing.c b/src/libFLAC/encoder_framing.c index d28c3b69..8b55e3da 100644 --- a/src/libFLAC/encoder_framing.c +++ b/src/libFLAC/encoder_framing.c @@ -337,9 +337,10 @@ bool subframe_add_residual_partitioned_rice_(FLAC__BitBuffer *bb, const int32 re if(i == 0) partition_samples -= predictor_order; k += partition_samples; - for(j = k_last; j < k; j++) + for(j = k_last; j < k; j++) { if(!FLAC__bitbuffer_write_rice_signed(bb, residual[j], rice_parameters[i])) return false; + } k_last = k; } return true; diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c index 442867ec..183f95fe 100644 --- a/src/libFLAC/stream_decoder.c +++ b/src/libFLAC/stream_decoder.c @@ -1204,7 +1204,7 @@ bool stream_decoder_read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder bool stream_decoder_read_zero_padding_(FLAC__StreamDecoder *decoder) { if(decoder->guts->input.consumed_bits != 0) { - uint32 zero; + uint32 zero = 0; if(!FLAC__bitbuffer_read_raw_uint32(&decoder->guts->input, &zero, 8-decoder->guts->input.consumed_bits, read_callback_, decoder)) return false; /* the read_callback_ sets the state for us */ if(zero != 0) {