Commit 763bee17 authored by Josh Coalson's avatar Josh Coalson
Browse files

*** empty log message ***

parent bcd8da93
...@@ -1005,7 +1005,7 @@ bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, int64 *val, unsigned bi ...@@ -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) 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; unsigned bit, uval;
assert(bb != 0); assert(bb != 0);
...@@ -1036,7 +1036,7 @@ bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned pa ...@@ -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) 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; unsigned bit, uval, k;
assert(bb != 0); assert(bb != 0);
......
...@@ -337,9 +337,10 @@ bool subframe_add_residual_partitioned_rice_(FLAC__BitBuffer *bb, const int32 re ...@@ -337,9 +337,10 @@ bool subframe_add_residual_partitioned_rice_(FLAC__BitBuffer *bb, const int32 re
if(i == 0) if(i == 0)
partition_samples -= predictor_order; partition_samples -= predictor_order;
k += partition_samples; 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])) if(!FLAC__bitbuffer_write_rice_signed(bb, residual[j], rice_parameters[i]))
return false; return false;
}
k_last = k; k_last = k;
} }
return true; return true;
......
...@@ -1204,7 +1204,7 @@ bool stream_decoder_read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder ...@@ -1204,7 +1204,7 @@ bool stream_decoder_read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder
bool stream_decoder_read_zero_padding_(FLAC__StreamDecoder *decoder) bool stream_decoder_read_zero_padding_(FLAC__StreamDecoder *decoder)
{ {
if(decoder->guts->input.consumed_bits != 0) { 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)) 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 */ return false; /* the read_callback_ sets the state for us */
if(zero != 0) { if(zero != 0) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment