|
@@ -4,7 +4,7 @@
|
|
|
#
|
|
|
################################################################################
|
|
|
|
|
|
-FFMPEG_VERSION = 3.3.5
|
|
|
+FFMPEG_VERSION = 3.4.1
|
|
|
FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz
|
|
|
FFMPEG_SITE = http://ffmpeg.org/releases
|
|
|
FFMPEG_INSTALL_STAGING = YES
|
|
@@ -53,14 +53,12 @@ FFMPEG_CONF_OPTS = \
|
|
|
--disable-libdc1394 \
|
|
|
--disable-libgsm \
|
|
|
--disable-libilbc \
|
|
|
- --disable-libnut \
|
|
|
--disable-libopenjpeg \
|
|
|
- --disable-libschroedinger \
|
|
|
--disable-libvo-amrwbenc \
|
|
|
--disable-symver \
|
|
|
--disable-doc
|
|
|
|
|
|
-FFMPEG_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) host-pkgconf
|
|
|
+FFMPEG_DEPENDENCIES += host-pkgconf
|
|
|
|
|
|
ifeq ($(BR2_PACKAGE_FFMPEG_GPL),y)
|
|
|
FFMPEG_CONF_OPTS += --enable-gpl
|
|
@@ -161,7 +159,10 @@ endif
|
|
|
ifeq ($(BR2_PACKAGE_FFMPEG_INDEVS),y)
|
|
|
FFMPEG_CONF_OPTS += --enable-indevs
|
|
|
ifeq ($(BR2_PACKAGE_ALSA_LIB),y)
|
|
|
+FFMPEG_CONF_OPTS += --enable-alsa
|
|
|
FFMPEG_DEPENDENCIES += alsa-lib
|
|
|
+else
|
|
|
+FFMPEG_CONF_OPTS += --disable-alsa
|
|
|
endif
|
|
|
else
|
|
|
FFMPEG_CONF_OPTS += --disable-indevs
|
|
@@ -344,6 +345,13 @@ else
|
|
|
FFMPEG_CONF_OPTS += --disable-libwavpack
|
|
|
endif
|
|
|
|
|
|
+ifeq ($(BR2_PACKAGE_LIBICONV),y)
|
|
|
+FFMPEG_CONF_OPTS += --enable-iconv
|
|
|
+FFMPEG_DEPENDENCIES += libiconv
|
|
|
+else
|
|
|
+FFMPEG_CONF_OPTS += --disable-iconv
|
|
|
+endif
|
|
|
+
|
|
|
# ffmpeg freetype support require fenv.h which is only
|
|
|
# available/working on glibc.
|
|
|
# The microblaze variant doesn't provide the needed exceptions
|
|
@@ -376,10 +384,10 @@ FFMPEG_CONF_OPTS += --disable-libx265
|
|
|
endif
|
|
|
|
|
|
ifeq ($(BR2_X86_CPU_HAS_MMX),y)
|
|
|
-FFMPEG_CONF_OPTS += --enable-yasm
|
|
|
-FFMPEG_DEPENDENCIES += host-yasm
|
|
|
+FFMPEG_CONF_OPTS += --enable-x86asm
|
|
|
+FFMPEG_DEPENDENCIES += host-nasm
|
|
|
else
|
|
|
-FFMPEG_CONF_OPTS += --disable-yasm
|
|
|
+FFMPEG_CONF_OPTS += --disable-x86asm
|
|
|
FFMPEG_CONF_OPTS += --disable-mmx
|
|
|
endif
|
|
|
|