aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-01-13 11:52:35 +0100
committerMax Kellermann <max@duempel.org>2014-01-13 11:52:35 +0100
commit8cd15a02cdbc0f9cb8c1c496fef103538cc5c425 (patch)
tree54cebd6d9c780a06e26bcbbe87da2733ac81fb2d
parentea771c17c55395b34d8ee3f8073a89d401c85835 (diff)
parent05ad335ae924521f43608a94345ee5c798a1e13e (diff)
downloadmpd-8cd15a02cdbc0f9cb8c1c496fef103538cc5c425.tar.gz
mpd-8cd15a02cdbc0f9cb8c1c496fef103538cc5c425.tar.xz
mpd-8cd15a02cdbc0f9cb8c1c496fef103538cc5c425.zip
Merge tag 'release-0.18.7'
-rw-r--r--NEWS3
-rw-r--r--configure.ac2
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 84eab0bb6..a3be05562 100644
--- a/NEWS
+++ b/NEWS
@@ -18,12 +18,13 @@ ver 0.19 (not yet released)
- shine: new encoder plugin
* new resampler option using libsoxr
-ver 0.18.7 (not yet released)
+ver 0.18.7 (2013/01/13)
* playlist
- pls: fix crash after parser error
- soundcloud: fix build failure with libyajl 2.0.1
* decoder
- faad: fix memory leak
+ - mpcdec: reject libmpcdec SV7 in configure script
* daemon: don't initialize supplementary groups when already running
as the configured user
diff --git a/configure.ac b/configure.ac
index 4ed3735ef..34fb4b1c1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1089,7 +1089,7 @@ AM_CONDITIONAL(ENABLE_SNDFILE, test x$enable_sndfile = xyes)
dnl --------------------------------- musepack --------------------------------
-MPD_AUTO_LIB(mpc, MPCDEC, mpcdec, main, [-lmpcdec], [],
+MPD_AUTO_LIB(mpc, MPCDEC, mpcdec, mpc_demux_init, [-lmpcdec], [],
[mpcdec], [libmpcdec not found])
if test x$enable_mpc = xyes; then
AC_DEFINE(HAVE_MPCDEC, 1, [Define to use libmpcdec for MPC decoding])