aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Makefile.am7
-rw-r--r--src/decoder_list.c4
2 files changed, 9 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 6f11caaab..cc8f6e55b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -182,7 +182,11 @@ mpd_SOURCES += decoder/wavpack_plugin.c
endif
if HAVE_FAAD
-mpd_SOURCES += decoder/aac_plugin.c decoder/mp4_plugin.c
+mpd_SOURCES += decoder/aac_plugin.c
+endif
+
+if HAVE_MP4
+mpd_SOURCES += decoder/mp4_plugin.c
endif
if HAVE_OGG_COMMON
@@ -293,6 +297,7 @@ mpd_LDADD = $(MPD_LIBS) \
$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
$(ID3TAG_LIBS) \
$(MAD_LIBS) \
+ $(MP4FF_LIBS) \
$(FFMPEG_LIBS) \
$(GLIB_LIBS)
diff --git a/src/decoder_list.c b/src/decoder_list.c
index 68c053c2a..edd147f54 100644
--- a/src/decoder_list.c
+++ b/src/decoder_list.c
@@ -50,9 +50,11 @@ static const struct decoder_plugin *const decoder_plugins[] = {
&audiofilePlugin,
#endif
#ifdef HAVE_FAAD
- &mp4Plugin,
&aacPlugin,
#endif
+#ifdef HAVE_MP4
+ &mp4Plugin,
+#endif
#ifdef HAVE_MPCDEC
&mpcPlugin,
#endif