diff options
| author | Ralph Giles <giles@thaumas.net> | 2022-02-13 20:34:41 -0800 |
|---|---|---|
| committer | Ralph Giles <giles@thaumas.net> | 2022-02-13 20:38:36 -0800 |
| commit | ef5c89e70507785d825835c4edb1b698c4e98513 (patch) | |
| tree | fd502cc4457161c0b217670e49ccd808d8a208d1 | |
| parent | f50609fc55743bca03380b44e4fe21f8ad756073 (diff) | |
| download | flac-ef5c89e70507785d825835c4edb1b698c4e98513.tar.gz | |
Revert "move the new public get_decoder_client_data function to public header."
Remove this from the 1.3.x release branch since it's an API
change. Backward-compatible, but still. This change should
instead be released as part of flac 1.4.0.
This reverts commit 19a0e99ac3ac5f1fc24d66612668a277ceba8195.
Signed-off-by: Martijn van Beurden <mvanb1@gmail.com>
| -rw-r--r-- | include/FLAC/stream_decoder.h | 10 | ||||
| -rw-r--r-- | src/libFLAC/include/protected/stream_decoder.h | 5 |
2 files changed, 5 insertions, 10 deletions
diff --git a/include/FLAC/stream_decoder.h b/include/FLAC/stream_decoder.h index 50ebfa80..57215c5e 100644 --- a/include/FLAC/stream_decoder.h +++ b/include/FLAC/stream_decoder.h @@ -1550,16 +1550,6 @@ FLAC_API FLAC__bool FLAC__stream_decoder_skip_single_frame(FLAC__StreamDecoder * */ FLAC_API FLAC__bool FLAC__stream_decoder_seek_absolute(FLAC__StreamDecoder *decoder, FLAC__uint64 sample); -/** Return client_data from decoder. - * The data pointed to by the pointer should not be modified. - * - * \param decoder A decoder instance. - * \retval const void * - * The callee's client data set through FLAC__stream_decoder_init_*(). - * Do not modify the contents. - */ -FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder); - /* \} */ #ifdef __cplusplus diff --git a/src/libFLAC/include/protected/stream_decoder.h b/src/libFLAC/include/protected/stream_decoder.h index 2f3996b3..99092751 100644 --- a/src/libFLAC/include/protected/stream_decoder.h +++ b/src/libFLAC/include/protected/stream_decoder.h @@ -57,4 +57,9 @@ typedef struct FLAC__StreamDecoderProtected { */ uint32_t FLAC__stream_decoder_get_input_bytes_unconsumed(const FLAC__StreamDecoder *decoder); +/* + * Return client_data from decoder. The data pointed to by the pointer should not be modified. + */ +FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder); + #endif |