diff options
Diffstat (limited to 'apps/codecs')
-rw-r--r-- | apps/codecs/libFLAC/bitbuffer.c | 4 | ||||
-rw-r--r-- | apps/codecs/libFLAC/include/FLAC/seekable_stream_decoder.h | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/include/FLAC/stream_decoder.h | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/include/private/bitbuffer.h | 4 | ||||
-rw-r--r-- | apps/codecs/libFLAC/seekable_stream_decoder.c | 2 | ||||
-rw-r--r-- | apps/codecs/libFLAC/stream_decoder.c | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/apps/codecs/libFLAC/bitbuffer.c b/apps/codecs/libFLAC/bitbuffer.c index a7332008ab..552a326ec2 100644 --- a/apps/codecs/libFLAC/bitbuffer.c +++ b/apps/codecs/libFLAC/bitbuffer.c | |||
@@ -317,7 +317,7 @@ static FLAC__bool bitbuffer_read_from_client_(FLAC__BitBuffer *bb, FLAC__bool (* | |||
317 | * | 317 | * |
318 | ***********************************************************************/ | 318 | ***********************************************************************/ |
319 | 319 | ||
320 | FLAC__BitBuffer *FLAC__bitbuffer_new() | 320 | FLAC__BitBuffer *FLAC__bitbuffer_new(void) |
321 | { | 321 | { |
322 | FLAC__BitBuffer *bb = (FLAC__BitBuffer*)calloc(1, sizeof(FLAC__BitBuffer)); | 322 | FLAC__BitBuffer *bb = (FLAC__BitBuffer*)calloc(1, sizeof(FLAC__BitBuffer)); |
323 | 323 | ||
@@ -1983,7 +1983,7 @@ FLAC__bool FLAC__bitbuffer_read_byte_block_aligned_no_crc(FLAC__BitBuffer *bb, F | |||
1983 | return true; | 1983 | return true; |
1984 | } | 1984 | } |
1985 | 1985 | ||
1986 | FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, unsigned *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) | 1986 | FLaC__INLINE FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, FLAC__uint32 *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data) |
1987 | #ifdef FLAC__NO_MANUAL_INLINING | 1987 | #ifdef FLAC__NO_MANUAL_INLINING |
1988 | { | 1988 | { |
1989 | unsigned bit, val_ = 0; | 1989 | unsigned bit, val_ = 0; |
diff --git a/apps/codecs/libFLAC/include/FLAC/seekable_stream_decoder.h b/apps/codecs/libFLAC/include/FLAC/seekable_stream_decoder.h index dee5a89cef..68a791b3a2 100644 --- a/apps/codecs/libFLAC/include/FLAC/seekable_stream_decoder.h +++ b/apps/codecs/libFLAC/include/FLAC/seekable_stream_decoder.h | |||
@@ -392,7 +392,7 @@ typedef void (*FLAC__SeekableStreamDecoderErrorCallback)(const FLAC__SeekableStr | |||
392 | * \retval FLAC__SeekableStreamDecoder* | 392 | * \retval FLAC__SeekableStreamDecoder* |
393 | * \c NULL if there was an error allocating memory, else the new instance. | 393 | * \c NULL if there was an error allocating memory, else the new instance. |
394 | */ | 394 | */ |
395 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(); | 395 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void); |
396 | 396 | ||
397 | /** Free a decoder instance. Deletes the object pointed to by \a decoder. | 397 | /** Free a decoder instance. Deletes the object pointed to by \a decoder. |
398 | * | 398 | * |
diff --git a/apps/codecs/libFLAC/include/FLAC/stream_decoder.h b/apps/codecs/libFLAC/include/FLAC/stream_decoder.h index 6cd59d42a9..99a3bb36ec 100644 --- a/apps/codecs/libFLAC/include/FLAC/stream_decoder.h +++ b/apps/codecs/libFLAC/include/FLAC/stream_decoder.h | |||
@@ -396,7 +396,7 @@ typedef void (*FLAC__StreamDecoderErrorCallback)(const FLAC__StreamDecoder *deco | |||
396 | * \retval FLAC__StreamDecoder* | 396 | * \retval FLAC__StreamDecoder* |
397 | * \c NULL if there was an error allocating memory, else the new instance. | 397 | * \c NULL if there was an error allocating memory, else the new instance. |
398 | */ | 398 | */ |
399 | FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(); | 399 | FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void); |
400 | 400 | ||
401 | /** Free a decoder instance. Deletes the object pointed to by \a decoder. | 401 | /** Free a decoder instance. Deletes the object pointed to by \a decoder. |
402 | * | 402 | * |
diff --git a/apps/codecs/libFLAC/include/private/bitbuffer.h b/apps/codecs/libFLAC/include/private/bitbuffer.h index c505fcfd47..886f97349f 100644 --- a/apps/codecs/libFLAC/include/private/bitbuffer.h +++ b/apps/codecs/libFLAC/include/private/bitbuffer.h | |||
@@ -56,7 +56,7 @@ typedef struct FLAC__BitBuffer FLAC__BitBuffer; | |||
56 | /* | 56 | /* |
57 | * construction, deletion, initialization, cloning functions | 57 | * construction, deletion, initialization, cloning functions |
58 | */ | 58 | */ |
59 | FLAC__BitBuffer *FLAC__bitbuffer_new(); | 59 | FLAC__BitBuffer *FLAC__bitbuffer_new(void); |
60 | void FLAC__bitbuffer_delete(FLAC__BitBuffer *bb); | 60 | void FLAC__bitbuffer_delete(FLAC__BitBuffer *bb); |
61 | FLAC__bool FLAC__bitbuffer_init(FLAC__BitBuffer *bb); | 61 | FLAC__bool FLAC__bitbuffer_init(FLAC__BitBuffer *bb); |
62 | FLAC__bool FLAC__bitbuffer_init_from(FLAC__BitBuffer *bb, const FLAC__byte buffer[], unsigned bytes); | 62 | FLAC__bool FLAC__bitbuffer_init_from(FLAC__BitBuffer *bb, const FLAC__byte buffer[], unsigned bytes); |
@@ -142,7 +142,7 @@ FLAC__bool FLAC__bitbuffer_read_raw_int64(FLAC__BitBuffer *bb, FLAC__int64 *val, | |||
142 | FLAC__bool FLAC__bitbuffer_read_raw_uint32_little_endian(FLAC__BitBuffer *bb, FLAC__uint32 *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); /*only for bits=32*/ | 142 | FLAC__bool FLAC__bitbuffer_read_raw_uint32_little_endian(FLAC__BitBuffer *bb, FLAC__uint32 *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); /*only for bits=32*/ |
143 | FLAC__bool FLAC__bitbuffer_skip_bits_no_crc(FLAC__BitBuffer *bb, unsigned bits, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); /* WATCHOUT: does not CRC the skipped data! */ /*@@@@ add to unit tests */ | 143 | FLAC__bool FLAC__bitbuffer_skip_bits_no_crc(FLAC__BitBuffer *bb, unsigned bits, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); /* WATCHOUT: does not CRC the skipped data! */ /*@@@@ add to unit tests */ |
144 | FLAC__bool FLAC__bitbuffer_read_byte_block_aligned_no_crc(FLAC__BitBuffer *bb, FLAC__byte *val, unsigned nvals, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); /* val may be 0 to skip bytes instead of reading them */ /* WATCHOUT: does not CRC the read data! */ | 144 | FLAC__bool FLAC__bitbuffer_read_byte_block_aligned_no_crc(FLAC__BitBuffer *bb, FLAC__byte *val, unsigned nvals, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); /* val may be 0 to skip bytes instead of reading them */ /* WATCHOUT: does not CRC the read data! */ |
145 | FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, unsigned *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); | 145 | FLAC__bool FLAC__bitbuffer_read_unary_unsigned(FLAC__BitBuffer *bb, FLAC__uint32 *val, FLAC__bool (*read_callback)(FLAC__byte buffer[], unsigned *bytes, void *client_data), void *client_data); |
146 | #ifdef FLAC__SYMMETRIC_RICE | 146 | #ifdef FLAC__SYMMETRIC_RICE |
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 |
diff --git a/apps/codecs/libFLAC/seekable_stream_decoder.c b/apps/codecs/libFLAC/seekable_stream_decoder.c index 2c899f20b3..53026068ff 100644 --- a/apps/codecs/libFLAC/seekable_stream_decoder.c +++ b/apps/codecs/libFLAC/seekable_stream_decoder.c | |||
@@ -135,7 +135,7 @@ FLAC_API const char * const FLAC__SeekableStreamDecoderLengthStatusString[] = { | |||
135 | * | 135 | * |
136 | ***********************************************************************/ | 136 | ***********************************************************************/ |
137 | 137 | ||
138 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new() | 138 | FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void) |
139 | { | 139 | { |
140 | FLAC__SeekableStreamDecoder *decoder; | 140 | FLAC__SeekableStreamDecoder *decoder; |
141 | 141 | ||
diff --git a/apps/codecs/libFLAC/stream_decoder.c b/apps/codecs/libFLAC/stream_decoder.c index 845ff90131..ec43314fe9 100644 --- a/apps/codecs/libFLAC/stream_decoder.c +++ b/apps/codecs/libFLAC/stream_decoder.c | |||
@@ -180,7 +180,7 @@ FLAC_API const char * const FLAC__StreamDecoderErrorStatusString[] = { | |||
180 | * Class constructor/destructor | 180 | * Class constructor/destructor |
181 | * | 181 | * |
182 | ***********************************************************************/ | 182 | ***********************************************************************/ |
183 | FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new() | 183 | FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void) |
184 | { | 184 | { |
185 | FLAC__StreamDecoder *decoder; | 185 | FLAC__StreamDecoder *decoder; |
186 | unsigned i; | 186 | unsigned i; |
@@ -1828,7 +1828,7 @@ FLAC__bool read_subframe_(FLAC__StreamDecoder *decoder, unsigned channel, unsign | |||
1828 | x &= 0xfe; | 1828 | x &= 0xfe; |
1829 | 1829 | ||
1830 | if(wasted_bits) { | 1830 | if(wasted_bits) { |
1831 | unsigned u; | 1831 | FLAC__uint32 u; |
1832 | if(!FLAC__bitbuffer_read_unary_unsigned(decoder->private_->input, &u, read_callback_, decoder)) | 1832 | if(!FLAC__bitbuffer_read_unary_unsigned(decoder->private_->input, &u, read_callback_, decoder)) |
1833 | return false; /* the read_callback_ sets the state for us */ | 1833 | return false; /* the read_callback_ sets the state for us */ |
1834 | decoder->private_->frame.subframes[channel].wasted_bits = u+1; | 1834 | decoder->private_->frame.subframes[channel].wasted_bits = u+1; |