Revert "libFLAC: Rename get_client_data_from_decoder function"

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 4ca0d85c5d0ea3e9d9afc4ac53b5187c9ab98689.

Signed-off-by: Martijn van Beurden <mvanb1@gmail.com>

2 files changed, 4 insertions, 4 deletions

diff --git a/src/libFLAC/include/protected/stream_decoder.h b/src/libFLAC/include/protected/stream_decoder.h
index 99092751..f7e20021 100644
--- a/src/libFLAC/include/protected/stream_decoder.h
+++ b/src/libFLAC/include/protected/stream_decoder.h
@@ -53,13 +53,13 @@ typedef struct FLAC__StreamDecoderProtected {
 } FLAC__StreamDecoderProtected;
 
 /*
- * Return the number of input bytes consumed
+ * return the number of input bytes consumed
  */
 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.
+ * return client_data from decoder
  */
-FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder);
+FLAC_API void *get_client_data_from_decoder(FLAC__StreamDecoder *decoder);
 
 #endif
diff --git a/src/libFLAC/stream_decoder.c b/src/libFLAC/stream_decoder.c
index 4380b486..ef6da44e 100644
--- a/src/libFLAC/stream_decoder.c
+++ b/src/libFLAC/stream_decoder.c
@@ -3448,7 +3448,7 @@ FLAC__bool file_eof_callback_(const FLAC__StreamDecoder *decoder, void *client_d
 	return feof(decoder->private_->file)? true : false;
 }
 
-FLAC_API const void *FLAC__get_decoder_client_data(FLAC__StreamDecoder *decoder)
+void *get_client_data_from_decoder(FLAC__StreamDecoder *decoder)
 {
 	return decoder->private_->client_data;
 }