ffmpeg: add dependency to fdk-aac for ffmpeg-full
Since getting rid of the patented line, it seems fdk-aac is now getting enabled for -full, causing a missing dependency. OTOH, fdk-aac can only be enabled if x264 is not. So add a ! dependency for it. Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
parent
81c3e2dfa4
commit
78b7bbbfa6
1 changed files with 3 additions and 2 deletions
|
@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
|
|||
|
||||
PKG_NAME:=ffmpeg
|
||||
PKG_VERSION:=3.4.7
|
||||
PKG_RELEASE:=3
|
||||
PKG_RELEASE:=4
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=https://ffmpeg.org/releases/
|
||||
|
@ -374,7 +374,8 @@ $(call Package/libffmpeg/Default)
|
|||
DEPENDS+= +alsa-lib +PACKAGE_libopus:libopus \
|
||||
+SOFT_FLOAT:shine \
|
||||
+!SOFT_FLOAT:lame-lib \
|
||||
+PACKAGE_libx264:libx264
|
||||
+PACKAGE_libx264:libx264 \
|
||||
+!PACKAGE_libx264:fdk-aac
|
||||
VARIANT:=full
|
||||
endef
|
||||
|
||||
|
|
Loading…
Reference in a new issue