summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-10-07 07:54:00 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-10-07 07:54:00 (GMT)
commit4ff345522306956172bf61b69eba63afb425e693 (patch)
tree962fe0c4263d840e8c43eba5a6897008473e2c77
parenta268b0528c8a00f84cc5b5240047b91ac281de7d (diff)
downloadbuildroot-4ff345522306956172bf61b69eba63afb425e693.tar.gz
buildroot-4ff345522306956172bf61b69eba63afb425e693.tar.bz2
ffmpeg: add options for postproc/swscale
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/multimedia/ffmpeg/Config.in11
-rw-r--r--package/multimedia/ffmpeg/ffmpeg.mk14
2 files changed, 23 insertions, 2 deletions
diff --git a/package/multimedia/ffmpeg/Config.in b/package/multimedia/ffmpeg/Config.in
index fb6591b..2f94991 100644
--- a/package/multimedia/ffmpeg/Config.in
+++ b/package/multimedia/ffmpeg/Config.in
@@ -47,6 +47,17 @@ config BR2_PACKAGE_FFMPEG_FFSERVER
help
FFserver is a streaming server for both audio and video.
+config BR2_PACKAGE_FFMPEG_POSTPROC
+ bool "Build libpostproc"
+ depends on BR2_PACKAGE_FFMPEG_GPL
+ help
+ Postproc is a library of video postprocessing routines.
+
+config BR2_PACKAGE_FFMPEG_SWSCALE
+ bool "Build libswscale"
+ help
+ Swscale is a library of video scaling routines.
+
config BR2_PACKAGE_FFMPEG_ENCODERS
string "Enabled encoders"
default "all"
diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk
index 4e6924c..959efa3 100644
--- a/package/multimedia/ffmpeg/ffmpeg.mk
+++ b/package/multimedia/ffmpeg/ffmpeg.mk
@@ -13,8 +13,6 @@ FFMPEG_CONF_OPT = \
--prefix=/usr \
--enable-shared \
--disable-avfilter \
- --disable-postproc \
- --disable-swscale \
--disable-vhook \
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
@@ -49,6 +47,18 @@ else
FFMPEG_CONF_OPT += --disable-ffserver
endif
+ifeq ($(BR2_PACKAGE_FFMPEG_POSTPROC),y)
+FFMPEG_CONF_OPT += --enable-postproc
+else
+FFMPEG_CONF_OPT += --disable-postproc
+endif
+
+ifeq ($(BR2_PACKAGE_FFMPEG_SWSCALE),y)
+FFMPEG_CONF_OPT += --enable-swscale
+else
+FFMPEG_CONF_OPT += --disable-swscale
+endif
+
ifneq ($(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),all)
FFMPEG_CONF_OPT += --disable-encoders \
$(foreach x,$(call qstrip,$(BR2_PACKAGE_FFMPEG_ENCODERS)),--enable-encoder=$(x))