bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[packages] ffmpeg: fix configuration for ffmpeg server support, don't build ffmpeg & ffserver if they're not selected, bump release number (closes: #7492)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@22006 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nico 2010-07-01 00:39:50 +00:00
parent 521c6a0c60
commit 4ffa724b7a
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/ffmpeg/Config.in
View File

@ -10,8 +10,9 @@ config FFMPEG_PATENTED
default BUILD_PATENTED default BUILD_PATENTED
config FFMPEG_FFSERVER_SUPPORT 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_MUXER_ffm
select FFMPEG_DEMUXER_ffm
select FFMPEG_DEMUXER_rtsp select FFMPEG_DEMUXER_rtsp
select FFMPEG_PROTOCOL_rtp select FFMPEG_PROTOCOL_rtp

6
multimedia/ffmpeg/Makefile
View File

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