diff options
Diffstat (limited to 'apps/codecs/libFLAC')
-rw-r--r-- | apps/codecs/libFLAC/bitbuffer.c | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/include/private/bitbuffer.h | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/stream_decoder.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/apps/codecs/libFLAC/bitbuffer.c b/apps/codecs/libFLAC/bitbuffer.c index fa9786e1f5..5ee8a83f71 100644 --- a/apps/codecs/libFLAC/bitbuffer.c +++ b/apps/codecs/libFLAC/bitbuffer.c | |||
@@ -2143,7 +2143,7 @@ FLAC__bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsig | |||
2143 | return true; | 2143 | return true; |
2144 | } | 2144 | } |
2145 | 2145 | ||
2146 | FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, int vals[], unsigned nvals, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) | 2146 | FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, FLAC__int32 vals[], unsigned nvals, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) |
2147 | #ifdef FLAC__OLD_MSVC_FLAVOR | 2147 | #ifdef FLAC__OLD_MSVC_FLAVOR |
2148 | { | 2148 | { |
2149 | const FLAC__blurb *buffer = bb->buffer; | 2149 | const FLAC__blurb *buffer = bb->buffer; |
diff --git a/apps/codecs/libFLAC/include/private/bitbuffer.h b/apps/codecs/libFLAC/include/private/bitbuffer.h index 886f97349f..18c812c039 100644 --- a/apps/codecs/libFLAC/include/private/bitbuffer.h +++ b/apps/codecs/libFLAC/include/private/bitbuffer.h | |||
@@ -147,7 +147,7 @@ FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, FLAC__uint32 | |||
147 | FLAC__bool FLAC__bitbuffer_read_symmetric_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); | 147 | FLAC__bool FLAC__bitbuffer_read_symmetric_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); |
148 | #endif | 148 | #endif |
149 | FLAC__bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); | 149 | FLAC__bool FLAC__bitbuffer_read_rice_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); |
150 | FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, int vals[], unsigned nvals, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); | 150 | FLAC__bool FLAC__bitbuffer_read_rice_signed_block(FLAC__BitBuffer *bb, FLAC__int32 vals[], unsigned nvals, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); |
151 | #if 0 /* UNUSED */ | 151 | #if 0 /* UNUSED */ |
152 | FLAC__bool FLAC__bitbuffer_read_golomb_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); | 152 | FLAC__bool FLAC__bitbuffer_read_golomb_signed(FLAC__BitBuffer *bb, int *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); |
153 | FLAC__bool FLAC__bitbuffer_read_golomb_unsigned(FLAC__BitBuffer *bb, unsigned *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); | 153 | FLAC__bool FLAC__bitbuffer_read_golomb_unsigned(FLAC__BitBuffer *bb, unsigned *val, unsigned parameter, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); |
diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c index 4d5dd0a0c0..8ff9c8bbd0 100644 --- a/apps/codecs/libFLAC/stream_decoder.c +++ b/apps/codecs/libFLAC/stream_decoder.c | |||
@@ -2129,7 +2129,7 @@ FLAC__bool read_residual_partitioned_rice_(FLAC__StreamDecoder *decoder, unsigne | |||
2129 | return false; /* the read_callback_ sets the state for us */ | 2129 | return false; /* the read_callback_ sets the state for us */ |
2130 | partitioned_rice_contents->raw_bits[partition] = rice_parameter; | 2130 | partitioned_rice_contents->raw_bits[partition] = rice_parameter; |
2131 | for(u = (partition_order == 0 || partition > 0)? 0 : predictor_order; u < partition_samples; u++, sample++) { | 2131 | for(u = (partition_order == 0 || partition > 0)? 0 : predictor_order; u < partition_samples; u++, sample++) { |
2132 | if(!FLAC__bitbuffer_read_raw_int32(decoder->private_->input, &i, rice_parameter, read_callback_, decoder)) | 2132 | if(!FLAC__bitbuffer_read_raw_int32(decoder->private_->input, (FLAC__uint32 *)&i, rice_parameter, read_callback_, decoder)) |
2133 | return false; /* the read_callback_ sets the state for us */ | 2133 | return false; /* the read_callback_ sets the state for us */ |
2134 | residual[sample] = i; | 2134 | residual[sample] = i; |
2135 | } | 2135 | } |