diff options
Diffstat (limited to 'apps')
| -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 (* * ***********************************************************************/ -FLAC__BitBuffer *FLAC__bitbuffer_new() +FLAC__BitBuffer *FLAC__bitbuffer_new(void) { FLAC__BitBuffer *bb = (FLAC__BitBuffer*)calloc(1, sizeof(FLAC__BitBuffer)); @@ -1983,7 +1983,7 @@ FLAC__bool FLAC__bitbuffer_read_byte_block_aligned_no_crc(FLAC__BitBuffer *bb, F return true; } -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) +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) #ifdef FLAC__NO_MANUAL_INLINING { 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 * \retval FLAC__SeekableStreamDecoder* * \c NULL if there was an error allocating memory, else the new instance. */ -FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(); +FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void); /** Free a decoder instance. Deletes the object pointed to by \a decoder. * 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 * \retval FLAC__StreamDecoder* * \c NULL if there was an error allocating memory, else the new instance. */ -FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(); +FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void); /** Free a decoder instance. Deletes the object pointed to by \a decoder. * 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; /* * construction, deletion, initialization, cloning functions */ -FLAC__BitBuffer *FLAC__bitbuffer_new(); +FLAC__BitBuffer *FLAC__bitbuffer_new(void); void FLAC__bitbuffer_delete(FLAC__BitBuffer *bb); FLAC__bool FLAC__bitbuffer_init(FLAC__BitBuffer *bb); 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, 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*/ 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 */ 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! */ -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); +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); #ifdef FLAC__SYMMETRIC_RICE 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); #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[] = { * ***********************************************************************/ -FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new() +FLAC_API FLAC__SeekableStreamDecoder *FLAC__seekable_stream_decoder_new(void) { FLAC__SeekableStreamDecoder *decoder; 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[] = { * Class constructor/destructor * ***********************************************************************/ -FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new() +FLAC_API FLAC__StreamDecoder *FLAC__stream_decoder_new(void) { FLAC__StreamDecoder *decoder; unsigned i; @@ -1828,7 +1828,7 @@ FLAC__bool read_subframe_(FLAC__StreamDecoder *decoder, unsigned channel, unsign x &= 0xfe; if(wasted_bits) { - unsigned u; + FLAC__uint32 u; if(!FLAC__bitbuffer_read_unary_unsigned(decoder->private_->input, &u, read_callback_, decoder)) return false; /* the read_callback_ sets the state for us */ decoder->private_->frame.subframes[channel].wasted_bits = u+1; |