aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorViliam Mateicka <viliam.mateicka@gmail.com>2008-10-17 22:27:33 +0200
committerMax Kellermann <max@duempel.org>2008-10-17 22:27:33 +0200
commit11ad9971415c18dfb8f2042b65da31d0102b8c91 (patch)
tree96cf617ba830f1c4037f10bd6bdf1eb8135f405f /src/Makefile.am
parent4ee8da2e694d29efef5f6311d3bf8504d474918f (diff)
downloadmpd-11ad9971415c18dfb8f2042b65da31d0102b8c91.tar.gz
mpd-11ad9971415c18dfb8f2042b65da31d0102b8c91.tar.xz
mpd-11ad9971415c18dfb8f2042b65da31d0102b8c91.zip
ffmpeg: new decoder plugin
[mk: fixed indent, changed copyright statement, added autoconf test, fixed includes paths, fixed 2 gcc warnings, don't close input stream twice]
Diffstat (limited to '')
-rw-r--r--src/Makefile.am6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 70222db0c..56360812a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -225,6 +225,10 @@ if HAVE_MIKMOD
mpd_SOURCES += inputPlugins/mod_plugin.c
endif
+if HAVE_FFMPEG
+mpd_SOURCES += inputPlugins/ffmpeg_plugin.c
+endif
+
if HAVE_ZEROCONF
mpd_SOURCES += zeroconf.c
@@ -240,6 +244,7 @@ mpd_CPPFLAGS = \
$(AUDIOFILE_CFLAGS) $(LIBMIKMOD_CFLAGS) \
$(ID3TAG_CFLAGS) \
$(MAD_CFLAGS) \
+ $(FFMPEG_CFLAGS) \
$(GLIB_CFLAGS)
mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \
$(AO_LIBS) $(ALSA_LIBS) \
@@ -248,6 +253,7 @@ mpd_LDADD = $(MPD_LIBS) $(MP4FF_LIB) \
$(AUDIOFILE_LIBS) $(LIBMIKMOD_LIBS) \
$(ID3TAG_LIBS) \
$(MAD_LIBS) \
+ $(FFMPEG_LIBS) \
$(GLIB_LIBS)
DIST_SUBDIRS = mp4ff