diff options
| author | Max Kellermann <max@duempel.org> | 2014-09-26 11:06:11 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-09-26 11:06:11 +0200 |
| commit | 8547611479f8169497d257da5e40dcd885398865 (patch) | |
| tree | 3a2cd4e5559ced80479c4e7024493bf12705f4fb /src | |
| parent | 45310d0cf6731bad36956510e5c54faab691a877 (diff) | |
| parent | fe45f282044c3500894f65b94a514ebe799da6a1 (diff) | |
| download | mpd-8547611479f8169497d257da5e40dcd885398865.tar.gz mpd-8547611479f8169497d257da5e40dcd885398865.tar.xz mpd-8547611479f8169497d257da5e40dcd885398865.zip | |
Merge tag 'v0.18.16'
Diffstat (limited to '')
| -rw-r--r-- | src/decoder/DecoderList.cxx | 2 | ||||
| -rw-r--r-- | src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx index 5a13e6694..0a31d9eac 100644 --- 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 diff --git a/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx b/src/playlist/plugins/EmbeddedCuePlaylistPlugin.cxx index 2e903ae03..9e8f91e05 100644 --- 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, |