Merge tag 'v0.18.16'

2014-09-26 11:06:11 +02:00
parent 45310d0cf6 fe45f28204
commit 8547611479
6 changed files with 35 additions and 52 deletions
--- a/src/decoder/DecoderList.cxx
+++ b/src/decoder/DecoderList.cxx
@@ -76,8 +76,10 @@ const struct DecoderPlugin *const decoder_plugins[] = {
 #ifdef HAVE_AUDIOFILE
 	&audiofile_decoder_plugin,
 #endif
+#ifdef ENABLE_DSD
 	&dsdiff_decoder_plugin,
 	&dsf_decoder_plugin,
+#endif
 #ifdef HAVE_FAAD
 	&faad_decoder_plugin,
 #endif
--- a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
+++ b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx
@@ -171,7 +171,7 @@ static const char *const embcue_playlist_suffixes[] = {
 };

 const struct playlist_plugin embcue_playlist_plugin = {
-	"cue",
+	"embcue",

 	nullptr,
 	nullptr,