From 97ed8f250943e56f354e3434854653c6dc839d83 Mon Sep 17 00:00:00 2001
From: Nicolas Thill <nico@openwrt.org>
Date: Thu, 1 Jul 2010 00:39:50 +0000
Subject: [PATCH] [packages] ffmpeg: fix configuration for ffmpeg server
 support, don't build ffmpeg & ffserver if they're not selected, bump release
 number (closes: #7492)

SVN-Revision: 22006
---
 multimedia/ffmpeg/Config.in | 3 ++-
 multimedia/ffmpeg/Makefile  | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 889cf8b21b..c5267f3f62 100644
--- 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 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 \
-- 
2.30.2