Merge tag 'release-0.18.7'

2014-01-13 11:52:35 +01:00
parent ea771c17c5 05ad335ae9
commit 8cd15a02cd
2 changed files with 3 additions and 2 deletions
--- a/3
+++ b/3
@@ -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

--- 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])