summaryrefslogtreecommitdiffstats
path: root/package/multimedia
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-02-19 20:42:02 +0100
committerPeter Korsgaard <jacmet@sunsite.dk>2011-02-19 20:42:02 +0100
commit833724e1b15a708a04a7912204bf0d2dfdc2254b (patch)
treedda7e2b18ffcf47bfe3ca75a66bc9499c095d644 /package/multimedia
parenta1c787ea6a7428fdfe88fd6c2333f35da5cec44d (diff)
downloadbuildroot-novena-833724e1b15a708a04a7912204bf0d2dfdc2254b.tar.gz
buildroot-novena-833724e1b15a708a04a7912204bf0d2dfdc2254b.zip
mpd: add option for ffmpeg support
For all the special file formats supported by ffmpeg. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/multimedia')
-rw-r--r--package/multimedia/mpd/Config.in11
-rw-r--r--package/multimedia/mpd/mpd.mk7
2 files changed, 18 insertions, 0 deletions
diff --git a/package/multimedia/mpd/Config.in b/package/multimedia/mpd/Config.in
index e418d32c1..2b3bacfbc 100644
--- a/package/multimedia/mpd/Config.in
+++ b/package/multimedia/mpd/Config.in
@@ -144,6 +144,17 @@ config BR2_PACKAGE_MPD_WAVPACK
Enable wavpack input support.
Select this if you want to play back WV files.
+config BR2_PACKAGE_MPD_FFMPEG
+ bool "ffmpeg"
+ select BR2_PACKAGE_FFMPEG
+ depends on BR2_LARGEFILE
+ help
+ Enable ffmpeg input support.
+ Select this if you want to play back files supported by ffmpeg.
+
+comment "ffmpeg support requires a toolchain with LARGEFILE support"
+ depends on !BR2_LARGEFILE
+
endif
comment "mpd requires a toolchain with C++ and WCHAR support"
diff --git a/package/multimedia/mpd/mpd.mk b/package/multimedia/mpd/mpd.mk
index 728feaa06..3653152f4 100644
--- a/package/multimedia/mpd/mpd.mk
+++ b/package/multimedia/mpd/mpd.mk
@@ -107,6 +107,13 @@ else
MPD_CONF_OPT += --disable-wavpack
endif
+ifeq ($(BR2_PACKAGE_MPD_FFMPEG),y)
+MPD_DEPENDENCIES += ffmpeg
+MPD_CONF_OPT += --enable-ffmpeg
+else
+MPD_CONF_OPT += --disable-ffmpeg
+endif
+
define MPD_INSTALL_EXTRA_FILES
@if [ ! -f $(TARGET_DIR)/etc/mpd.conf ]; then \
$(INSTALL) -D package/multimedia/mpd/mpd.conf \