diff options
| author | Max Kellermann <max@duempel.org> | 2014-08-07 22:52:46 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-08-07 22:52:46 +0200 |
| commit | 7a048f004dc1c7d35518e38c75861bc167ade945 (patch) | |
| tree | acd003908655626a1e2e96c8cec0c21747283d09 /src/decoder/DecoderList.cxx | |
| parent | aa2e4d92e0005f4516eb591803120eff89f99109 (diff) | |
| parent | 330b6a04822a49aec23a968061faac4f49a94afa (diff) | |
| download | mpd-7a048f004dc1c7d35518e38c75861bc167ade945.tar.gz mpd-7a048f004dc1c7d35518e38c75861bc167ade945.tar.xz mpd-7a048f004dc1c7d35518e38c75861bc167ade945.zip | |
Merge branch 'id-3919' of git://github.com/ekroth/mpd
Diffstat (limited to 'src/decoder/DecoderList.cxx')
| -rw-r--r-- | src/decoder/DecoderList.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/decoder/DecoderList.cxx b/src/decoder/DecoderList.cxx index 5d9d44d34..5a13e6694 100644 --- a/src/decoder/DecoderList.cxx +++ b/src/decoder/DecoderList.cxx @@ -37,6 +37,7 @@ #include "plugins/MadDecoderPlugin.hxx" #include "plugins/SndfileDecoderPlugin.hxx" #include "plugins/Mpg123DecoderPlugin.hxx" +#include "plugins/Mp4v2DecoderPlugin.hxx" #include "plugins/WildmidiDecoderPlugin.hxx" #include "plugins/MikmodDecoderPlugin.hxx" #include "plugins/ModplugDecoderPlugin.hxx" @@ -54,6 +55,9 @@ const struct DecoderPlugin *const decoder_plugins[] = { #ifdef HAVE_MPG123 &mpg123_decoder_plugin, #endif +#ifdef HAVE_MP4V2 + &mp4v2_decoder_plugin, +#endif #ifdef ENABLE_VORBIS_DECODER &vorbis_decoder_plugin, #endif |