Merge.

2 files changed, 7 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index d6821b4a2..6f393bcf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-02  Carl Hetherington  <cth@carlh.net>
+
+	* Switch to soxr resampler as it seems
+	to have fewer artefacts in some cases (#682, possibly #493).
+
 2015-09-02  c.hetherington  <cth@carlh.net>
 
 	* Fix problems when changing the number
diff --git a/src/lib/resampler.cc b/src/lib/resampler.cc
index 2538f7dca..f54f4ec6a 100644
--- a/src/lib/resampler.cc
+++ b/src/lib/resampler.cc
@@ -52,6 +52,8 @@ Resampler::Resampler (int in, int out, int channels)
 	av_opt_set_int (_swr_context, "isr", _in_rate, 0);
 	av_opt_set_int (_swr_context, "osr", _out_rate, 0);
 
+	av_opt_set (_swr_context, "resampler", "soxr", 0);
+
 	swr_init (_swr_context);
 }