[packages] ffmpeg: fix configuration for ffmpeg server support, don't build ffmpeg...

git-svn-id: svn://svn.openwrt.org/openwrt/packages@22006 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 889cf8b..c5267f3 100644 (file)
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -10,8 +10,9 @@ config FFMPEG_PATENTED
        default BUILD_PATENTED
 
 config FFMPEG_FFSERVER_SUPPORT
-       bool "Include support for FFmpeg streaming support"
+       bool "Include support for ffserver (FFmpeg streaming server)"
        select FFMPEG_MUXER_ffm
+       select FFMPEG_DEMUXER_ffm
        select FFMPEG_DEMUXER_rtsp
        select FFMPEG_PROTOCOL_rtp
 

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 75e9e1b..28639f3 100644 (file)
--- 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 \