aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-11-03 16:48:12 +0100
committerMax Kellermann <max@duempel.org>2008-11-03 16:48:12 +0100
commitf70dccdce10f599be288431da166b5b09a53135c (patch)
treeb98d0b53a523e9a6402fc09ccc69eba41a8afbb8 /src
parent9074f924e9258e6801d96d7dbc8b9d525b7c6e2a (diff)
downloadmpd-f70dccdce10f599be288431da166b5b09a53135c.tar.gz
mpd-f70dccdce10f599be288431da166b5b09a53135c.tar.xz
mpd-f70dccdce10f599be288431da166b5b09a53135c.zip
configure.ac: separate the "aac" and "mp4" decoder tests
MPD used to have a copy of the mp4ff library. Since that has been removed, AAC suport was disabled when there was no libmp4ff. Separate the libmp4ff test, and enable AAC support no matter if libmp4ff is available.
Diffstat (limited to 'src')
-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