X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=multimedia%2Fffmpeg%2FMakefile;h=28639f333102f8ef21973b5de200a6ff2ed5b6e2;hp=75e9e1be9563a62c578c8c156996f15a070cf6c8;hb=97ed8f250943e56f354e3434854653c6dc839d83;hpb=abba09dde91d17f3e3da08232a8367be8f128995

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 75e9e1be95..28639f3331 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ffmpeg
 PKG_VERSION:=0.5.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://ffmpeg.org/releases/
@@ -185,8 +185,6 @@ define Build/Configure
 		--enable-shared \
 		--enable-static \
 		--disable-debug \
-		--enable-ffmpeg \
-		--enable-ffserver \
 		--enable-gpl \
 		--disable-libfaad \
 		--disable-mmx \
@@ -199,6 +197,8 @@ define Build/Configure
 		--enable-zlib \
 		--enable-postproc \
 		\
+		$(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \
+		$(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \
 		$(if $(CONFIG_FFMPEG_IPV6),,--disable-ipv6) \
 		\
 		--disable-bsfs \