Merge branch 'v0.17.x'

6 files changed, 51 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index dbe9b2751..05904c1e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,6 +41,7 @@ tags
 .#*
 .stgit*
 src/dsd2pcm/dsd2pcm
+src/win/mpd_win32_rc.rc
 doc/doxygen.conf
 doc/protocol.html
 doc/protocol
diff --git a/Makefile.am b/Makefile.am
index 875ea4ccc..cf41e3ddd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1443,4 +1443,4 @@ endif
 EXTRA_DIST = $(doc_DATA) autogen.sh \
 	$(wildcard scripts/*.sh) \
 	$(man_MANS) $(DOCBOOK_FILES) doc/mpdconf.example doc/doxygen.conf \
-	src/win/mpd_win32_rc.rc.in
+	src/win/mpd_win32_rc.rc.in src/win/mpd.ico
diff --git a/NEWS b/NEWS
index 822dc2fd5..8d634a03e 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,11 @@ ver 0.18 (2012/??/??)
   - new option "tags" may be used to disable sending tags to output
 * improved decoder/output error reporting
 
+
+ver 0.17.4 (2013/??/??)
+* decoder:
+  - ffmpeg: support float planar audio (ffmpeg 1.1)
+
 ver 0.17.3 (2013/01/06)
 * output:
   - osx: fix pops during playback
diff --git a/configure.ac b/configure.ac
index 70d3cc40a..1dd2126b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -886,7 +886,7 @@ fi
 AM_CONDITIONAL(ENABLE_FLUIDSYNTH, test x$enable_fluidsynth = xyes)
 
 dnl ---------------------------------- libgme ---------------------------------
-MPD_AUTO_PKG(gme, GME, [libgme],
+MPD_AUTO_PKG_LIB(gme, GME, [libgme], gme, gme_open_file, [-lgme -lstdc++], [],
 	[gme decoder plugin], [libgme not found])
 AM_CONDITIONAL(HAVE_GME, test x$enable_gme = xyes)
 if test x$enable_gme = xyes; then
diff --git a/doc/mpdconf.example b/doc/mpdconf.example
index 8cae72e94..390d26beb 100644
--- a/doc/mpdconf.example
+++ b/doc/mpdconf.example
@@ -281,6 +281,25 @@ input {
 ##	sink		"remote_server_sink"	# optional
 #}
 #
+# An example of a winmm output (Windows multimedia API).
+#
+#audio_output {
+#	type		"winmm"
+#	name		"My WinMM output"
+##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#		or
+##	device		"0"		# optional
+##	mixer_type	"hardware"	# optional
+#}
+#
+# An example of an openal output.
+#
+#audio_output {
+#	type		"openal"
+#	name		"My OpenAL output"
+##	device		"Digital Audio (S/PDIF) (High Definition Audio Device)" # optional
+#}
+#
 ## Example "pipe" output:
 #
 #audio_output {
@@ -321,8 +340,11 @@ input {
 # Normalization automatic volume adjustments ##################################
 #
 # This setting specifies the type of ReplayGain to use. This setting can have
-# the argument "off", "album" or "track". See <http://www.replaygain.org>
-# for more details. This setting is off by default.
+# the argument "off", "album", "track" or "auto". "auto" is a special mode that
+# chooses between "track" and "album" depending on the current state of
+# random playback. If random playback is enabled then "track" mode is used.
+# See <http://www.replaygain.org> for more details about ReplayGain.
+# This setting is off by default.
 #
 #replaygain			"album"
 #
@@ -331,6 +353,20 @@ input {
 #
 #replaygain_preamp		"0"
 #
+# This setting sets the pre-amp used for files that do NOT have ReplayGain tags.
+# By default this setting is disabled.
+#
+#replaygain_missing_preamp	"0"
+#
+# This setting enables or disables ReplayGain limiting.
+# MPD calculates actual amplification based on the ReplayGain tags
+# and replaygain_preamp / replaygain_missing_preamp setting.
+# If replaygain_limit is enabled MPD will never amplify audio signal
+# above its original level. If replaygain_limit is disabled such amplification
+# might occur. By default this setting is enabled.
+#
+#replaygain_limit		"yes"
+#
 # This setting enables on-the-fly normalization volume adjustment. This will
 # result in the volume of all playing audio to be adjusted so the output has 
 # equal "loudness". This setting is disabled by default.
diff --git a/src/decoder/ffmpeg_decoder_plugin.c b/src/decoder/ffmpeg_decoder_plugin.c
index 72a5ff341..4c4cb2b81 100644
--- a/src/decoder/ffmpeg_decoder_plugin.c
+++ b/src/decoder/ffmpeg_decoder_plugin.c
@@ -395,6 +395,11 @@ ffmpeg_sample_format(enum AVSampleFormat sample_fmt)
 #endif
 		return SAMPLE_FORMAT_S32;
 
+#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51,17,0)
+	case AV_SAMPLE_FMT_FLTP:
+		return SAMPLE_FORMAT_FLOAT;
+#endif
+
 	default:
 		break;
 	}