diff --git a/deps/flac/include/FLAC/callback.h b/deps/flac/include/FLAC/callback.h index 59d2ee0c..d00878b6 100644 --- a/deps/flac/include/FLAC/callback.h +++ b/deps/flac/include/FLAC/callback.h @@ -168,12 +168,12 @@ typedef int (*FLAC__IOCallback_Close) (FLAC__IOHandle handle); * a data source is not seekable by setting the \a seek field to \c NULL. */ typedef struct { - FLAC__IOCallback_Read read; - FLAC__IOCallback_Write write; - FLAC__IOCallback_Seek seek; - FLAC__IOCallback_Tell tell; - FLAC__IOCallback_Eof eof; - FLAC__IOCallback_Close close; + FLAC__IOCallback_Read read; /**< See FLAC__IOCallbacks */ + FLAC__IOCallback_Write write; /**< See FLAC__IOCallbacks */ + FLAC__IOCallback_Seek seek; /**< See FLAC__IOCallbacks */ + FLAC__IOCallback_Tell tell; /**< See FLAC__IOCallbacks */ + FLAC__IOCallback_Eof eof; /**< See FLAC__IOCallbacks */ + FLAC__IOCallback_Close close; /**< See FLAC__IOCallbacks */ } FLAC__IOCallbacks; /* \} */ diff --git a/deps/flac/include/FLAC/export.h b/deps/flac/include/FLAC/export.h index cde72b73..983f13b1 100644 --- a/deps/flac/include/FLAC/export.h +++ b/deps/flac/include/FLAC/export.h @@ -49,13 +49,24 @@ * This module contains \#defines and symbols for exporting function * calls, and providing version information and compiled-in features. * - * If you are compiling with MSVC and will link to the static library - * (libFLAC.lib) you should define FLAC__NO_DLL in your project to - * make sure the symbols are exported properly. + * If you are compiling for Windows (with Visual Studio or MinGW for + * example) and will link to the static library (libFLAC++.lib) you + * should define FLAC__NO_DLL in your project to make sure the symbols + * are exported properly. * * \{ */ +/** This \#define is used internally in libFLAC and its headers to make + * sure the correct symbols are exported when working with shared + * libraries. On Windows, this \#define is set to __declspec(dllexport) + * when compiling libFLAC into a library and to __declspec(dllimport) + * when the headers are used to link to that DLL. On non-Windows systems + * it is used to set symbol visibility. + * + * Because of this, the define FLAC__NO_DLL must be defined when linking + * to libFLAC statically or linking will fail. + */ /* This has grown quite complicated. FLAC__NO_DLL is used by MSVC sln * files and CMake, which build either static or shared. autotools can * build static, shared or **both**. Therefore, DLL_EXPORT, which is set diff --git a/deps/flac/include/FLAC/format.h b/deps/flac/include/FLAC/format.h index 7835f839..99d637f0 100644 --- a/deps/flac/include/FLAC/format.h +++ b/deps/flac/include/FLAC/format.h @@ -120,8 +120,7 @@ extern "C" { #define FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE (32u) /** The maximum sample rate permitted by the format. The value is - * ((2 ^ 16) - 1) * 10; see FLAC format - * as to why. + * ((2 ^ 20) - 1) */ #define FLAC__MAX_SAMPLE_RATE (1048575u) diff --git a/deps/flac/include/FLAC/stream_encoder.h b/deps/flac/include/FLAC/stream_encoder.h index a39d0ed2..1d7bd258 100644 --- a/deps/flac/include/FLAC/stream_encoder.h +++ b/deps/flac/include/FLAC/stream_encoder.h @@ -311,8 +311,7 @@ typedef enum { FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_BITS_PER_SAMPLE, /**< The encoder has an invalid setting for bits-per-sample. - * FLAC supports 4-32 bps but the reference encoder currently supports - * only up to 24 bps. + * FLAC supports 4-32 bps. */ FLAC__STREAM_ENCODER_INIT_STATUS_INVALID_SAMPLE_RATE, @@ -843,15 +842,15 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en * max residual partition order * rice parameter search dist * - * 0 false false tukey(0.5) 0 0 false false false 0 3 0 - * 1 true true tukey(0.5) 0 0 false false false 0 3 0 - * 2 true false tukey(0.5) 0 0 false false false 0 3 0 - * 3 false false tukey(0.5) 6 0 false false false 0 4 0 - * 4 true true tukey(0.5) 8 0 false false false 0 4 0 - * 5 true false tukey(0.5) 8 0 false false false 0 5 0 - * 6 true false tukey(0.5);partial_tukey(2) 8 0 false false false 0 6 0 - * 7 true false tukey(0.5);partial_tukey(2) 12 0 false false false 0 6 0 - * 8 true false tukey(0.5);partial_tukey(2);punchout_tukey(3) 12 0 false false false 0 6 0 + * 0 false false tukey(0.5) 0 0 false false false 0 3 0 + * 1 true true tukey(0.5) 0 0 false false false 0 3 0 + * 2 true false tukey(0.5) 0 0 false false false 0 3 0 + * 3 false false tukey(0.5) 6 0 false false false 0 4 0 + * 4 true true tukey(0.5) 8 0 false false false 0 4 0 + * 5 true false tukey(0.5) 8 0 false false false 0 5 0 + * 6 true false subdivide_tukey(2) 8 0 false false false 0 6 0 + * 7 true false subdivide_tukey(2) 12 0 false false false 0 6 0 + * 8 true false subdivide_tukey(2) 12 0 false false false 0 6 0 * * * \default \c 5 @@ -921,7 +920,7 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_loose_mid_side_stereo(FLAC__StreamE * \c blackman, \c blackman_harris_4term_92db, \c connes, \c flattop, * \c gauss(STDDEV), \c hamming, \c hann, \c kaiser_bessel, \c nuttall, * \c rectangle, \c triangle, \c tukey(P), \c partial_tukey(n[/ov[/P]]), - * \c punchout_tukey(n[/ov[/P]]), \c welch. + * \c punchout_tukey(n[/ov[/P]]), \c subdivide_tukey(n[/P]), \c welch. * * For \c gauss(STDDEV), STDDEV specifies the standard deviation * (0= requested version. # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "1.4.0") +set(PACKAGE_VERSION "1.4.1") if (PACKAGE_FIND_VERSION_RANGE) # Package version must be in the requested version range diff --git a/deps/flac/lib/libFLAC.a b/deps/flac/lib/libFLAC.a index 9a8f7e3c..3bd2a5aa 100644 Binary files a/deps/flac/lib/libFLAC.a and b/deps/flac/lib/libFLAC.a differ diff --git a/deps/flac/lib/pkgconfig/flac.pc b/deps/flac/lib/pkgconfig/flac.pc index 91d230a2..d36e70fb 100644 --- a/deps/flac/lib/pkgconfig/flac.pc +++ b/deps/flac/lib/pkgconfig/flac.pc @@ -5,7 +5,7 @@ includedir=${prefix}/include Name: FLAC Description: Free Lossless Audio Codec Library -Version: 1.4.0 +Version: 1.4.1 Requires.private: ogg Libs: -L${libdir} -lFLAC Libs.private: -lm