diff options
| author | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-03-19 09:58:07 +0100 |
| commit | 0c9fc2f8090ed225c76296088e6760630eb42779 (patch) | |
| tree | 9238436fb89ebf6a91d329eba0f5feec1ad137fd /src/encoder/flac_encoder.c | |
| parent | 1a954748a027aa5b4fc6c85b0ad96c2fa25d53b8 (diff) | |
| parent | fe588a255ba713875a21bb98d3b7daf60af2844e (diff) | |
| download | mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.gz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.tar.xz mpd-0c9fc2f8090ed225c76296088e6760630eb42779.zip | |
Merge commit 'release-0.16.2'
Conflicts:
Makefile.am
NEWS
configure.ac
Diffstat (limited to 'src/encoder/flac_encoder.c')
| -rw-r--r-- | src/encoder/flac_encoder.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/encoder/flac_encoder.c b/src/encoder/flac_encoder.c index 4312fedb2..a7d35597e 100644 --- a/src/encoder/flac_encoder.c +++ b/src/encoder/flac_encoder.c @@ -55,7 +55,7 @@ static bool flac_encoder_configure(struct flac_encoder *encoder, const struct config_param *param, G_GNUC_UNUSED GError **error) { - encoder->compression = config_get_block_unsigned(param, + encoder->compression = config_get_block_unsigned(param, "compression", 5); return true; @@ -218,7 +218,7 @@ flac_encoder_open(struct encoder *_encoder, struct audio_format *audio_format, if (init_status != FLAC__STREAM_ENCODER_OK) { g_set_error(error, flac_encoder_quark(), 0, - "failed to initialize encoder: %s\n", + "failed to initialize encoder: %s\n", FLAC__StreamEncoderStateString[init_status]); flac_encoder_close(_encoder); return false; @@ -234,7 +234,7 @@ flac_encoder_open(struct encoder *_encoder, struct audio_format *audio_format, if(init_status != FLAC__STREAM_ENCODER_INIT_STATUS_OK) { g_set_error(error, flac_encoder_quark(), 0, - "failed to initialize encoder: %s\n", + "failed to initialize encoder: %s\n", FLAC__StreamEncoderInitStatusString[init_status]); flac_encoder_close(_encoder); return false; |