FFmpeg 0.8.2 Version Bump (#8831)
Dropped configure options:
--disable-ipv6: IPv6 is no longer a separate switch. It's network aware or
isn't.
--disable-libfaad: This switch isn't listed as part of ./configure --help.
--disable-vhook: vhook is no longer a part of ffmpeg.
Added configure options:
--disable-doc: Disables documentation
--disable-dxva2: Disables Microsoft's DirectX Video Acceleration v2
--enable-version3: Builds GPLv3 code
--disable-filters: Disables audio/video stream processing filters
--disable-hwaccels: Disables hardware video playback acceleration
--disable-ffplay: FFplay is a SDL(?) based media player.
Dropped formats:
oss is not listed in ./configure --list-muxers
mpeg4aac is not listed in ./configure --list-decoders
Configure options were reordered to roughly be:
Generic program configure switches
Libav* feature options
Binary selection
All of the libav* feature disabling was done at once. This is to keep from
second guessing FFmpeg's internal dependency checking when we start enabling
options.
Added options to keep from mass disabling encoders/muxers and
decoders/demuxers. This should address #8831's issue.
Added option to build FFprobe. FFprobe is a command line media identification
tool, very similar to the output of a bare ffmpeg -i.
Signed-off-by: Ian Leonard <antonla...@gmail.com>
---
Note to testers: Many codecs were renamed between ffmpeg 0.5 and 0.6. Scripts
calling ffmpeg will probably break. The ABI/API also changed.
My minimal build increased libffmpeg's size by about 110KB using the same
configuration from 0.5, if memory serves me correctly.
There is a part of the Makefile that notes why mmx and mmx2 are disabled
(register starvation, I believe). I do not have a suitable machine to test if
this is still necessary.
I only use libffmpeg. Testing welcome.
---
Index: feeds/packages/multimedia/ffmpeg/Config.in
===================================================================
--- feeds/packages/multimedia/ffmpeg/Config.in (revision 28033)
+++ feeds/packages/multimedia/ffmpeg/Config.in (working copy)
@@ -1,10 +1,14 @@
menu "Configuration"
depends PACKAGE_libffmpeg
-config FFMPEG_IPV6
- bool "Enable IPv6"
- default IPV6
+config FFMPEG_ENCODE
+ bool "Big Toggle for FFmpeg's encoder/muxer support"
+ depends FFMPEG_PATENTED
+config FFMPEG_DECODE
+ bool "Big Toggle for FFmpeg's decoder/demuxer support"
+ depends FFMPEG_PATENTED
+
config FFMPEG_PATENTED
bool "Include patented codecs and technologies"
default BUILD_PATENTED
@@ -27,7 +31,6 @@
select FFMPEG_DECODER_mpeg1video
select FFMPEG_DECODER_mpeg2video
select FFMPEG_DECODER_mpeg4
- select FFMPEG_DECODER_mpeg4aac
select FFMPEG_DECODER_mpegvideo
select FFMPEG_DECODER_wmav1
select FFMPEG_DECODER_wmav2
@@ -49,7 +52,6 @@
select FFMPEG_DECODER_mpeg1video
select FFMPEG_DECODER_mpeg2video
select FFMPEG_DECODER_mpeg4
- select FFMPEG_DECODER_mpeg4aac
select FFMPEG_DECODER_mpegvideo
select FFMPEG_DECODER_wmav1
select FFMPEG_DECODER_wmav2
@@ -153,10 +155,6 @@
bool "MPEG-4"
depends FFMPEG_PATENTED
-config FFMPEG_DECODER_mpeg4aac
- bool "MPEG-4 (AAC)"
- depends FFMPEG_PATENTED
-
config FFMPEG_DECODER_pcm_s16be
bool "PCM signed 16-bit big-endian"
@@ -212,9 +210,6 @@
config FFMPEG_MUXER_ogg
bool "Ogg"
-config FFMPEG_MUXER_oss
- bool "OSS (Open Sound System playback)"
-
config FFMPEG_MUXER_rtp
bool "RTP"
@@ -322,4 +317,3 @@
bool "udp:"
endmenu
-
Index: feeds/packages/multimedia/ffmpeg/Makefile
===================================================================
--- feeds/packages/multimedia/ffmpeg/Makefile (revision 28033)
+++ feeds/packages/multimedia/ffmpeg/Makefile (working copy)
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
-PKG_VERSION:=0.5.4
-PKG_RELEASE:=2
+PKG_VERSION:=0.8.2
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ffmpeg.org/releases/
-PKG_MD5SUM:=87e771cd0f5d465fbf1a0a4824b7cc24
+PKG_MD5SUM:=967d481c98161582d149aced6e3b2f31
FFMPEG_ENCODERS:= \
ac3 \
@@ -40,7 +40,6 @@
mpeg1video \
mpeg2video \
mpeg4 \
- mpeg4aac \
mpegvideo \
pcm_s16be \
pcm_s16le \
@@ -60,7 +59,6 @@
mpeg2video \
mpegts \
ogg \
- oss \
rtp \
FFMPEG_DEMUXERS:= \
@@ -127,6 +125,20 @@
This package contains the FFmpeg command line tool.
endef
+define Package/ffprobe
+$(call Package/ffmpeg/Default)
+ SECTION:=multimedia
+ CATEGORY:=Multimedia
+ TITLE+= CLI media identifier
+ DEPENDS+= +libffmpeg
+endef
+
+define Package/ffprobe/description
+$(call Package/ffmpeg/Default/description)
+ .
+ This package contains the FFprobe command line tool.
+endef
+
define Package/ffserver
$(call Package/ffserver/Default)
SECTION:=multimedia
@@ -154,7 +166,7 @@
source "$(SOURCE)/Config.in"
endef
-define Package/libffmeg/description
+define Package/libffmpeg/description
$(call Package/ffmpeg/Default/description)
.
This package contains FFmpeg shared libraries.
@@ -211,37 +223,42 @@
--enable-shared \
--enable-static \
--disable-debug \
+ \
--enable-gpl \
- --disable-libfaad \
+ --enable-version3 \
+ \
+ --disable-doc \
+ --disable-dxva2 \
--disable-mmx \
--disable-mmx2 \
--enable-pthreads \
--disable-optimizations \
--enable-small \
--disable-stripping \
- --disable-vhook \
--enable-zlib \
--enable-postproc \
--enable-swscale \
\
- $(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \
- $(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \
- $(if $(CONFIG_FFMPEG_IPV6),,--disable-ipv6) \
- \
--disable-bsfs \
--disable-devices \
- --disable-encoders \
+ --disable-filters \
+ --disable-hwaccels \
+ --disable-parsers \
+ --disable-protocols \
+ $(if $(CONFIG_FFMPEG_ENCODE),,--disable-encoders
--disable-muxers) \
+ $(if $(CONFIG_FFMPEG_DECODE),,--disable-decoders
--disable-demuxers) \
$(FFMPEG_CONFIGURE_ENCODERS) \
- --disable-decoders \
$(FFMPEG_CONFIGURE_DECODERS) \
- --disable-muxers \
$(FFMPEG_CONFIGURE_MUXERS) \
- --disable-demuxers \
$(FFMPEG_CONFIGURE_DEMUXERS) \
- --disable-parsers \
$(FFMPEG_CONFIGURE_PARSERS) \
- --disable-protocols \
$(FFMPEG_CONFIGURE_PROTOCOLS) \
+ \
+ $(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \
+ --disable-ffplay \
+ $(if $(CONFIG_PACKAGE_ffprobe),,--disable-ffprobe) \
+ $(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \
+ \
)
endef
@@ -270,6 +287,11 @@
$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffmpeg $(1)/usr/bin/
endef
+define Package/ffprobe/install
+ $(INSTALL_DIR_ $(1)/usr/bin
+ $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/
+endef
+
define Package/ffserver/install
$(INSTALL_DIR) $(1)/usr/bin
$(CP) $(PKG_INSTALL_DIR)/usr/bin/ffserver $(1)/usr/bin/
@@ -291,6 +313,7 @@
endef
$(eval $(call BuildPackage,ffmpeg))
+$(eval $(call BuildPackage,ffprobe))
$(eval $(call BuildPackage,ffserver))
$(eval $(call BuildPackage,libffmpeg))
$(eval $(call BuildPackage,libpostproc))
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel
