oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'v0.15.x' into v0.16.x

Browse Source 
Conflicts:
	NEWS
	configure.ac
	src/directory.h
This commit is contained in:
Max Kellermann
2011-01-07 23:50:23 +01:00
parent 2a56300f7b 0022fb100b
commit 8c0afd8557
6 changed files with 25 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/encoder/lame_encoder.c
View File

@@ -170,6 +170,13 @@ lame_encoder_setup(struct lame_encoder *encoder, GError **error)
return false;
}
if (0 != lame_set_out_samplerate(encoder->gfp,
encoder->audio_format.sample_rate)) {
g_set_error(error, lame_encoder_quark(), 0,
"error setting lame out sample rate");
return false;
}
if (0 > lame_init_params(encoder->gfp)) {
g_set_error(error, lame_encoder_quark(), 0,
"error initializing lame params");