aboutsummaryrefslogtreecommitdiffstats
path: root/src/encoder/lame_encoder.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-01-07 23:52:23 +0100
committerMax Kellermann <max@duempel.org>2011-01-07 23:52:23 +0100
commit1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788 (patch)
tree8a13ed86728b59caebd86dc7a1287c234b4985f1 /src/encoder/lame_encoder.c
parenta800afcbf8845df0edc6aee3bb48036bba34e255 (diff)
parent8c0afd8557b1823e2df94c9f4de90c29eafbf035 (diff)
downloadmpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.gz
mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.tar.xz
mpd-1a2ea4c06cd9fd648bb0243a0dfd9e0b960a6788.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (limited to 'src/encoder/lame_encoder.c')
-rw-r--r--src/encoder/lame_encoder.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/encoder/lame_encoder.c b/src/encoder/lame_encoder.c
index a8ef72020..df843471b 100644
--- a/src/encoder/lame_encoder.c
+++ b/src/encoder/lame_encoder.c
@@ -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");