Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4697 from antonlacon/ffmpeg-next

Browse source 
ffmpeg: update to 3.2.7
This commit is contained in:
Ted Hess 2017-08-19 09:56:23 -04:00 committed by GitHub
commit b1cd3a955a
2 changed files with 24 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
multimedia/ffmpeg/Config.in
View file

@ -119,12 +119,6 @@ config FFMPEG_CUSTOM_AUDIO_DEC_SUPPORT
select FFMPEG_CUSTOM_DEMUXER_sdp select FFMPEG_CUSTOM_DEMUXER_sdp
select FFMPEG_CUSTOM_DEMUXER_wav select FFMPEG_CUSTOM_DEMUXER_wav
select FFMPEG_CUSTOM_DEMUXER_wv select FFMPEG_CUSTOM_DEMUXER_wv
select FFMPEG_CUSTOM_PARSER_aac
select FFMPEG_CUSTOM_PARSER_aac_latm
select FFMPEG_CUSTOM_PARSER_ac3
select FFMPEG_CUSTOM_PARSER_flac
select FFMPEG_CUSTOM_PARSER_mpegaudio
select FFMPEG_CUSTOM_PARSER_opus
select FFMPEG_CUSTOM_PROTOCOL_file select FFMPEG_CUSTOM_PROTOCOL_file
select FFMPEG_CUSTOM_PROTOCOL_http select FFMPEG_CUSTOM_PROTOCOL_http
select FFMPEG_CUSTOM_PROTOCOL_rtp select FFMPEG_CUSTOM_PROTOCOL_rtp
@ -141,7 +135,6 @@ config FFMPEG_CUSTOM_SELECT_libfdk-aac
config FFMPEG_CUSTOM_SELECT_libmp3lame config FFMPEG_CUSTOM_SELECT_libmp3lame
bool "Libmp3lame" bool "Libmp3lame"
depends on FFMPEG_CUSTOM_PATENTED
depends on PACKAGE_lame-lib depends on PACKAGE_lame-lib
select FFMPEG_CUSTOM_DECODER_mp3 select FFMPEG_CUSTOM_DECODER_mp3
select FFMPEG_CUSTOM_MUXER_mp3 select FFMPEG_CUSTOM_MUXER_mp3
@ -161,14 +154,12 @@ config FFMPEG_CUSTOM_SELECT_libx264
select FFMPEG_CUSTOM_DECODER_h264 select FFMPEG_CUSTOM_DECODER_h264
select FFMPEG_CUSTOM_MUXER_h264 select FFMPEG_CUSTOM_MUXER_h264
select FFMPEG_CUSTOM_DEMUXER_h264 select FFMPEG_CUSTOM_DEMUXER_h264
select FFMPEG_CUSTOM_PARSER_h264
comment "Encoders" comment "Encoders"
config FFMPEG_CUSTOM_ENCODER_ac3 config FFMPEG_CUSTOM_ENCODER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_PARSER_ac3
config FFMPEG_CUSTOM_ENCODER_jpegls config FFMPEG_CUSTOM_ENCODER_jpegls
bool "JPEG-LS" bool "JPEG-LS"
@ -205,7 +196,6 @@ comment "Decoders"
config FFMPEG_CUSTOM_DECODER_aac config FFMPEG_CUSTOM_DECODER_aac
bool "AAC (Advanced Audio Coding)" bool "AAC (Advanced Audio Coding)"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_PARSER_aac
config FFMPEG_CUSTOM_SELECT_adpcm config FFMPEG_CUSTOM_SELECT_adpcm
bool "ADPCM (multiple types)" bool "ADPCM (multiple types)"
@ -213,7 +203,6 @@ config FFMPEG_CUSTOM_SELECT_adpcm
config FFMPEG_CUSTOM_DECODER_ac3 config FFMPEG_CUSTOM_DECODER_ac3
bool "AC3" bool "AC3"
depends on FFMPEG_CUSTOM_PATENTED depends on FFMPEG_CUSTOM_PATENTED
select FFMPEG_CUSTOM_PARSER_ac3
config FFMPEG_CUSTOM_DECODER_alac config FFMPEG_CUSTOM_DECODER_alac
bool "ALAC" bool "ALAC"
@ -235,7 +224,6 @@ config FFMPEG_CUSTOM_DECODER_atrac3
config FFMPEG_CUSTOM_DECODER_flac config FFMPEG_CUSTOM_DECODER_flac
bool "FLAC" bool "FLAC"
select FFMPEG_CUSTOM_PARSER_flac
config FFMPEG_CUSTOM_DECODER_gif config FFMPEG_CUSTOM_DECODER_gif
bool "GIF" bool "GIF"
@ -253,11 +241,9 @@ config FFMPEG_CUSTOM_DECODER_jpegls
config FFMPEG_CUSTOM_DECODER_mp2 config FFMPEG_CUSTOM_DECODER_mp2
bool "MP2 (MPEG Audio Layer 2)" 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)" bool "MP3 (MPEG Audio Layer 3)"
depends on FFMPEG_CUSTOM_PATENTED
config FFMPEG_CUSTOM_DECODER_mpegvideo config FFMPEG_CUSTOM_DECODER_mpegvideo
bool "MPEG Video" bool "MPEG Video"
@ -395,7 +381,6 @@ config FFMPEG_CUSTOM_DEMUXER_mov
config FFMPEG_CUSTOM_DEMUXER_mp3 config FFMPEG_CUSTOM_DEMUXER_mp3
bool "MP3 (MPEG Audio Layer 3)" bool "MP3 (MPEG Audio Layer 3)"
select FFMPEG_CUSTOM_PARSER_mpegaudio
config FFMPEG_CUSTOM_DEMUXER_mpegvideo config FFMPEG_CUSTOM_DEMUXER_mpegvideo
bool "MPEG Video" bool "MPEG Video"

68
multimedia/ffmpeg/Makefile
View file

@ -9,13 +9,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.2.6 PKG_VERSION:=3.2.7
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://ffmpeg.org/releases/ PKG_SOURCE_URL:=https://ffmpeg.org/releases/
PKG_MD5SUM:=7a35bd97bd7253305bf5c0af5f9dd3ce PKG_HASH:=28e75fc32485a88035a7ebf0a956a1e5c7e93b440dd4bbd6bc30c7268cf34fe9
PKG_HASH:=3751cebb5c71a861288267769114d12b966a7703a686a325d90a93707f3a6d9f
PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>, \
Ian Leonard <antonlacon@gmail.com> Ian Leonard <antonlacon@gmail.com>
@ -150,7 +149,7 @@ FFMPEG_MINI_DEMUXERS:= \
ogg \ ogg \
FFMPEG_MINI_PROTOCOLS:= \ FFMPEG_MINI_PROTOCOLS:= \
file \ file
FFMPEG_AUDIO_DECODERS:= \ FFMPEG_AUDIO_DECODERS:= \
aac \ aac \
@ -200,14 +199,6 @@ FFMPEG_AUDIO_DEMUXERS:= \
wav \ wav \
wv \ wv \
FFMPEG_AUDIO_PARSERS:= \
aac \
aac_latm \
ac3 \
flac \
mpegaudio \
opus \
FFMPEG_AUDIO_PROTOCOLS:= \ FFMPEG_AUDIO_PROTOCOLS:= \
file http icecast rtp tcp udp file http icecast rtp tcp udp
@ -380,34 +371,16 @@ FFMPEG_CONFIGURE:= \
--disable-doc \ --disable-doc \
--disable-debug \ --disable-debug \
\ \
--disable-dxva2 \
--disable-lzma \ --disable-lzma \
--disable-vaapi \ --disable-vaapi \
--disable-vda \
--disable-vdpau \ --disable-vdpau \
--disable-outdevs --disable-outdevs
ifeq ($(CONFIG_SOFT_FLOAT),y) ifeq ($(CONFIG_SOFT_FLOAT),y)
FFMPEG_CONFIGURE += \ FFMPEG_CONFIGURE+= \
--disable-altivec \ --disable-altivec \
--disable-vsx \ --disable-vsx \
--disable-power8 \ --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-armv5te \
--disable-armv6 \ --disable-armv6 \
--disable-armv6t2 \ --disable-armv6t2 \
@ -421,37 +394,39 @@ FFMPEG_CONFIGURE += \
--disable-runtime-cpudetect --disable-runtime-cpudetect
else ifneq ($(findstring arm,$(CONFIG_ARCH)),) else ifneq ($(findstring arm,$(CONFIG_ARCH)),)
FFMPEG_CONFIGURE += \ FFMPEG_CONFIGURE+= \
--disable-runtime-cpudetect --disable-runtime-cpudetect
# XXX: GitHub issue 3320 ppc cpu with fpu but no altivec (WNDR4700) # XXX: GitHub issue 3320 ppc cpu with fpu but no altivec (WNDR4700)
else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),) else ifneq ($(findstring powerpc,$(CONFIG_ARCH)),)
FFMPEG_CONFIGURE += \ FFMPEG_CONFIGURE+= \
--disable-altivec --disable-altivec
endif endif
# selectively disable optimizations according to arch/cpu type # selectively disable optimizations according to arch/cpu type
ifneq ($(findstring arm,$(CONFIG_ARCH)),) ifneq ($(findstring arm,$(CONFIG_ARCH)),)
FFMPEG_CONFIGURE+= --enable-lto
ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),) ifneq ($(findstring vfp,$(CONFIG_TARGET_OPTIMIZATION)),)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= --enable-vfp
--enable-vfp
else else
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= --disable-vfp
--disable-vfp
endif endif
ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),) ifneq ($(findstring neon,$(CONFIG_TARGET_OPTIMIZATION)),)
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-neon \ --enable-neon \
--enable-vfp --enable-vfp
else else
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= --disable-neon
--disable-neon
endif endif
endif endif
ifeq ($(ARCH),x86_64)
FFMPEG_CONFIGURE+= --enable-lto
endif
ifneq ($(CONFIG_YASM),y) ifneq ($(CONFIG_YASM),y)
FFMPEG_CONFIGURE += \ FFMPEG_CONFIGURE+= --disable-yasm
--disable-yasm
endif endif
@ -465,8 +440,12 @@ ifeq ($(BUILD_VARIANT),full)
\ \
$(if $(CONFIG_PACKAGE_shine),--enable-libshine) $(if $(CONFIG_PACKAGE_shine),--enable-libshine)
else else
ifeq ($(ARCH),x86_64)
FFMPEG_CONFIGURE+= --enable-hardcoded-tables
else
FFMPEG_CONFIGURE+= --enable-small
endif
FFMPEG_CONFIGURE+= \ FFMPEG_CONFIGURE+= \
--enable-small \
--enable-gpl \ --enable-gpl \
\ \
$(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \ $(if $(CONFIG_PACKAGE_lame-lib),--enable-libmp3lame) \
@ -568,7 +547,6 @@ ifeq ($(BUILD_VARIANT),audio-dec)
--disable-everything \ --disable-everything \
$(call FFMPEG_ENABLE,decoder,$(FFMPEG_AUDIO_DECODERS)) \ $(call FFMPEG_ENABLE,decoder,$(FFMPEG_AUDIO_DECODERS)) \
$(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \ $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_AUDIO_DEMUXERS)) \
$(call FFMPEG_ENABLE,parser,$(FFMPEG_AUDIO_PARSERS)) \
$(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \ $(call FFMPEG_ENABLE,protocol,$(FFMPEG_AUDIO_PROTOCOLS)) \
--disable-decoder=pcm_bluray,pcm_dvd \ --disable-decoder=pcm_bluray,pcm_dvd \
@ -597,7 +575,7 @@ ifeq ($(BUILD_VARIANT),mini)
endif endif
ifneq ($(CONFIG_TARGET_x86),) ifneq ($(CONFIG_TARGET_x86),)
TARGET_CFLAGS += -fomit-frame-pointer TARGET_CFLAGS+= -fomit-frame-pointer
endif endif
define Build/Configure define Build/Configure