Removes the x86 optimization disables from the SOFT_FLOAT portion. There are no i386 profiles that do
not use hard float, so these options accomplish nothing.
Target-os=linux rules out dxva2 and vda, so disable statements are unnecessary.
For x86-64 users of libffmpeg-full, optimize around performance instead of size.
Remove patented flag requirement from mp2 and mp3 audio files in libffmpeg-custom per expiration.
Tidies up some of the configure steps where only one option is being changed or cosmetic consistency.
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
config FFMPEG_CUSTOM_SELECT_libmp3lame
bool "Libmp3lame"
config FFMPEG_CUSTOM_SELECT_libmp3lame
bool "Libmp3lame"
- depends on FFMPEG_CUSTOM_PATENTED
depends on PACKAGE_lame-lib
select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_MUXER_mp3
depends on PACKAGE_lame-lib
select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_MUXER_mp3
config FFMPEG_CUSTOM_DECODER_mp2
bool "MP2 (MPEG Audio Layer 2)"
config FFMPEG_CUSTOM_DECODER_mp2
bool "MP2 (MPEG Audio Layer 2)"
- depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_mp3
config FFMPEG_CUSTOM_DECODER_mp3
- bool "MP3 (MPEG Audio Layer 2)"
- depends on FFMPEG_CUSTOM_PATENTED
+ bool "MP3 (MPEG Audio Layer 3)"
config FFMPEG_CUSTOM_DECODER_mpegvideo
bool "MPEG Video"
config FFMPEG_CUSTOM_DECODER_mpegvideo
bool "MPEG Video"
include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg
-PKG_VERSION:=3.2.6
-PKG_RELEASE:=2
+PKG_VERSION:=3.2.7
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
-PKG_MD5SUM:=7a35bd97bd7253305bf5c0af5f9dd3ce
-PKG_HASH:=3751cebb5c71a861288267769114d12b966a7703a686a325d90a93707f3a6d9f
+PKG_HASH:=28e75fc32485a88035a7ebf0a956a1e5c7e93b440dd4bbd6bc30c7268cf34fe9
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Ian Leonard <antonlacon@gmail.com>
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Ian Leonard <antonlacon@gmail.com>
ogg \
FFMPEG_MINI_PROTOCOLS:= \
ogg \
FFMPEG_MINI_PROTOCOLS:= \
FFMPEG_AUDIO_DECODERS:= \
aac \
FFMPEG_AUDIO_DECODERS:= \
aac \
--disable-doc \
--disable-debug \
\
--disable-doc \
--disable-debug \
\
--disable-lzma \
--disable-vaapi \
--disable-lzma \
--disable-vaapi \
--disable-vdpau \
--disable-outdevs
ifeq ($(CONFIG_SOFT_FLOAT),y)
--disable-vdpau \
--disable-outdevs
ifeq ($(CONFIG_SOFT_FLOAT),y)
--disable-altivec \
--disable-vsx \
--disable-power8 \
--disable-altivec \
--disable-vsx \
--disable-power8 \
- --disable-amd3dnow \
- --disable-amd3dnowext \
- --disable-mmx \
- --disable-mmxext \
- --disable-sse \
- --disable-sse2 \
- --disable-sse3 \
- --disable-ssse3 \
- --disable-sse4 \
- --disable-sse42 \
- --disable-avx \
- --disable-xop \
- --disable-fma3 \
- --disable-fma4 \
- --disable-avx2 \
- --disable-aesni \
--disable-armv5te \
--disable-armv6 \
--disable-armv6t2 \
--disable-armv5te \
--disable-armv6 \
--disable-armv6t2 \
--disable-runtime-cpudetect
else ifneq ($(findstring arm,$(CONFIG_ARCH)),)
--disable-runtime-cpudetect
else ifneq ($(findstring arm,$(CONFIG_ARCH)),)
--disable-runtime-cpudetect
# XXX: GitHub issue 3320 ppc cpu with fpu but no altivec (WNDR4700)
else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
--disable-runtime-cpudetect
# XXX: GitHub issue 3320 ppc cpu with fpu but no altivec (WNDR4700)
else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
--disable-altivec
endif
# selectively disable optimizations according to arch/cpu type
ifneq ($(findstring arm,$(CONFIG_ARCH)),)
ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
--disable-altivec
endif
# selectively disable optimizations according to arch/cpu type
ifneq ($(findstring arm,$(CONFIG_ARCH)),)
ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
- FFMPEG_CONFIGURE+= \
- --enable-vfp
+ FFMPEG_CONFIGURE+= --enable-vfp
- FFMPEG_CONFIGURE+= \
- --disable-vfp
+ FFMPEG_CONFIGURE+= --disable-vfp
endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
FFMPEG_CONFIGURE+= \
--enable-neon \
--enable-vfp
else
endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
FFMPEG_CONFIGURE+= \
--enable-neon \
--enable-vfp
else
- FFMPEG_CONFIGURE+= \
- --disable-neon
+ FFMPEG_CONFIGURE+= --disable-neon
endif
endif
ifneq ($(CONFIG_YASM),y)
endif
endif
ifneq ($(CONFIG_YASM),y)
-FFMPEG_CONFIGURE += \
- --disable-yasm
+FFMPEG_CONFIGURE+= --disable-yasm
\
$(if $(CONFIG_PACKAGE_shine),--enable-libshine)
else
\
$(if $(CONFIG_PACKAGE_shine),--enable-libshine)
else
+ ifeq ($(ARCH),x86_64)
+ FFMPEG_CONFIGURE+= --enable-hardcoded-tables
+ else
+ FFMPEG_CONFIGURE+= --enable-small
+ endif
--enable-gpl \
\
$(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \
--enable-gpl \
\
$(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \
endif
ifneq ($(CONFIG_TARGET_x86),)
endif
ifneq ($(CONFIG_TARGET_x86),)
- TARGET_CFLAGS += -fomit-frame-pointer
+ TARGET_CFLAGS+= -fomit-frame-pointer
endif
define Build/Configure
endif
define Build/Configure