diff options
| author | 2014-04-07 06:04:18 +0000 | |
|---|---|---|
| committer | 2014-04-07 06:04:18 +0000 | |
| commit | fec65e0b5766ade69e086d1c5b859d97494fce56 (patch) | |
| tree | c22b07938e9ad590184f1276bc2bead6d888a78d /src/lib/libflac/include/FLAC | |
| parent | 30d94e51c53f30187a1bc565ef33e4744319790e (diff) | |
Cleanups and version bumpmame0153
Diffstat (limited to 'src/lib/libflac/include/FLAC')
| -rw-r--r-- | src/lib/libflac/include/FLAC/export.h | 4 | ||||
| -rw-r--r-- | src/lib/libflac/include/FLAC/format.h | 7 | ||||
| -rw-r--r-- | src/lib/libflac/include/FLAC/metadata.h | 3 | ||||
| -rw-r--r-- | src/lib/libflac/include/FLAC/stream_decoder.h | 8 | ||||
| -rw-r--r-- | src/lib/libflac/include/FLAC/stream_encoder.h | 6 |
5 files changed, 5 insertions, 23 deletions
diff --git a/src/lib/libflac/include/FLAC/export.h b/src/lib/libflac/include/FLAC/export.h index a525f29c1e5..e8295b86eac 100644 --- a/src/lib/libflac/include/FLAC/export.h +++ b/src/lib/libflac/include/FLAC/export.h @@ -61,9 +61,9 @@ #else #ifdef FLAC_API_EXPORTS -#define FLAC_API _declspec(dllexport) +#define FLAC_API _declspec(dllexport) #else -#define FLAC_API _declspec(dllimport) +#define FLAC_API _declspec(dllimport) #endif #endif diff --git a/src/lib/libflac/include/FLAC/format.h b/src/lib/libflac/include/FLAC/format.h index 77e2d0130e5..2c838f34f8e 100644 --- a/src/lib/libflac/include/FLAC/format.h +++ b/src/lib/libflac/include/FLAC/format.h @@ -84,8 +84,8 @@ extern "C" { /* - Most of the values described in this file are defined by the FLAC - format specification. There is nothing to tune here. + Most of the values described in this file are defined by the FLAC + format specification. There is nothing to tune here. */ /** The largest legal metadata type code. */ @@ -211,7 +211,6 @@ extern FLAC_API const char * const FLAC__EntropyCodingMethodTypeString[]; /** Contents of a Rice partitioned residual */ typedef struct { - unsigned *parameters; /**< The Rice parameters for each context. */ @@ -230,7 +229,6 @@ typedef struct { /** Header for a Rice partitioned residual. (c.f. <A HREF="../format.html#partitioned_rice">format specification</A>) */ typedef struct { - unsigned order; /**< The partition order, i.e. # of contexts = 2 ^ \a order. */ @@ -486,7 +484,6 @@ typedef struct { /** An enumeration of the available metadata block types. */ typedef enum { - FLAC__METADATA_TYPE_STREAMINFO = 0, /**< <A HREF="../format.html#metadata_block_streaminfo">STREAMINFO</A> block */ diff --git a/src/lib/libflac/include/FLAC/metadata.h b/src/lib/libflac/include/FLAC/metadata.h index fff90b0bafd..879b0b40a63 100644 --- a/src/lib/libflac/include/FLAC/metadata.h +++ b/src/lib/libflac/include/FLAC/metadata.h @@ -306,7 +306,6 @@ typedef struct FLAC__Metadata_SimpleIterator FLAC__Metadata_SimpleIterator; * The iterator's current status can be obtained by calling FLAC__metadata_simple_iterator_status(). */ typedef enum { - FLAC__METADATA_SIMPLE_ITERATOR_STATUS_OK = 0, /**< The iterator is in the normal OK state */ @@ -763,7 +762,7 @@ typedef enum { FLAC__METADATA_CHAIN_STATUS_READ_WRITE_MISMATCH, /**< FLAC__metadata_chain_write() was called on a chain read by * FLAC__metadata_chain_read_with_callbacks()/FLAC__metadata_chain_read_ogg_with_callbacks(), - * or + * or * FLAC__metadata_chain_write_with_callbacks()/FLAC__metadata_chain_write_with_callbacks_and_tempfile() * was called on a chain read by * FLAC__metadata_chain_read()/FLAC__metadata_chain_read_ogg(). diff --git a/src/lib/libflac/include/FLAC/stream_decoder.h b/src/lib/libflac/include/FLAC/stream_decoder.h index 9ac159474af..1d44a36f204 100644 --- a/src/lib/libflac/include/FLAC/stream_decoder.h +++ b/src/lib/libflac/include/FLAC/stream_decoder.h @@ -199,7 +199,6 @@ extern "C" { * The decoder's state can be obtained by calling FLAC__stream_decoder_get_state(). */ typedef enum { - FLAC__STREAM_DECODER_SEARCH_FOR_METADATA = 0, /**< The decoder is ready to search for metadata. */ @@ -253,7 +252,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderStateString[]; /** Possible return values for the FLAC__stream_decoder_init_*() functions. */ typedef enum { - FLAC__STREAM_DECODER_INIT_STATUS_OK = 0, /**< Initialization was successful. */ @@ -291,7 +289,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderInitStatusString[]; /** Return values for the FLAC__StreamDecoder read callback. */ typedef enum { - FLAC__STREAM_DECODER_READ_STATUS_CONTINUE, /**< The read was OK and decoding can continue. */ @@ -322,7 +319,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderReadStatusString[]; /** Return values for the FLAC__StreamDecoder seek callback. */ typedef enum { - FLAC__STREAM_DECODER_SEEK_STATUS_OK, /**< The seek was OK and decoding can continue. */ @@ -345,7 +341,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderSeekStatusString[]; /** Return values for the FLAC__StreamDecoder tell callback. */ typedef enum { - FLAC__STREAM_DECODER_TELL_STATUS_OK, /**< The tell was OK and decoding can continue. */ @@ -368,7 +363,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderTellStatusString[]; /** Return values for the FLAC__StreamDecoder length callback. */ typedef enum { - FLAC__STREAM_DECODER_LENGTH_STATUS_OK, /**< The length call was OK and decoding can continue. */ @@ -391,7 +385,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderLengthStatusString[]; /** Return values for the FLAC__StreamDecoder write callback. */ typedef enum { - FLAC__STREAM_DECODER_WRITE_STATUS_CONTINUE, /**< The write was OK and decoding can continue. */ @@ -424,7 +417,6 @@ extern FLAC_API const char * const FLAC__StreamDecoderWriteStatusString[]; * a future encoder. */ typedef enum { - FLAC__STREAM_DECODER_ERROR_STATUS_LOST_SYNC, /**< An error in the stream caused the decoder to lose synchronization. */ diff --git a/src/lib/libflac/include/FLAC/stream_encoder.h b/src/lib/libflac/include/FLAC/stream_encoder.h index dbbbb23ee11..f533d8c8430 100644 --- a/src/lib/libflac/include/FLAC/stream_encoder.h +++ b/src/lib/libflac/include/FLAC/stream_encoder.h @@ -238,7 +238,6 @@ extern "C" { * must be deleted with FLAC__stream_encoder_delete(). */ typedef enum { - FLAC__STREAM_ENCODER_OK = 0, /**< The encoder is in the normal OK state and samples can be processed. */ @@ -290,7 +289,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderStateString[]; /** Possible return values for the FLAC__stream_encoder_init_*() functions. */ typedef enum { - FLAC__STREAM_ENCODER_INIT_STATUS_OK = 0, /**< Initialization was successful. */ @@ -360,7 +358,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderInitStatusString[]; /** Return values for the FLAC__StreamEncoder read callback. */ typedef enum { - FLAC__STREAM_ENCODER_READ_STATUS_CONTINUE, /**< The read was OK and decoding can continue. */ @@ -386,7 +383,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderReadStatusString[]; /** Return values for the FLAC__StreamEncoder write callback. */ typedef enum { - FLAC__STREAM_ENCODER_WRITE_STATUS_OK = 0, /**< The write was OK and encoding can continue. */ @@ -406,7 +402,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderWriteStatusString[]; /** Return values for the FLAC__StreamEncoder seek callback. */ typedef enum { - FLAC__STREAM_ENCODER_SEEK_STATUS_OK, /**< The seek was OK and encoding can continue. */ @@ -429,7 +424,6 @@ extern FLAC_API const char * const FLAC__StreamEncoderSeekStatusString[]; /** Return values for the FLAC__StreamEncoder tell callback. */ typedef enum { - FLAC__STREAM_ENCODER_TELL_STATUS_OK, /**< The tell was OK and encoding can continue. */ |
