diff options
| -rw-r--r-- | src/combined/decoder_flac.c | 8 | ||||
| -rw-r--r-- | src/combined/demux_flac.c | 8 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c index fe1822797..079c01008 100644 --- a/src/combined/decoder_flac.c +++ b/src/combined/decoder_flac.c @@ -82,11 +82,19 @@ typedef struct flac_decoder_s { * FLAC callback functions */ +#ifdef LEGACY_FLAC static FLAC__StreamDecoderReadStatus flac_read_callback (const FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) +#else +static FLAC__StreamDecoderReadStatus +flac_read_callback (const FLAC__StreamDecoder *decoder, + FLAC__byte buffer[], + size_t *bytes, + void *client_data) +#endif { flac_decoder_t *this = (flac_decoder_t *)client_data; int number_of_bytes_to_copy; diff --git a/src/combined/demux_flac.c b/src/combined/demux_flac.c index 9c5f7de32..494bb5050 100644 --- a/src/combined/demux_flac.c +++ b/src/combined/demux_flac.c @@ -103,13 +103,17 @@ typedef struct demux_flac_class_s { static #ifdef LEGACY_FLAC FLAC__SeekableStreamDecoderReadStatus +flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, + FLAC__byte buffer[], + unsigned *bytes, + void *client_data) #else FLAC__StreamDecoderReadStatus -#endif flac_read_callback (const FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], - unsigned *bytes, + size_t *bytes, void *client_data) +#endif { demux_flac_t *this = (demux_flac_t *)client_data; input_plugin_t *input = this->input; |