diff options
| author | Rosen Penev <rosenp@gmail.com> | 2020-03-23 12:19:03 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-23 12:19:03 -0700 |
| commit | 73b75ed1066d26520a38a0724f388caf6addab52 (patch) | |
| tree | 4849b06222cffcf4a6c917c84e209dc09a75a38d | |
| parent | 3ca125971d9cbc4af520e672bd3dd86c49384730 (diff) | |
| parent | 78b7bbbfa60bbe165b7b38025f2d5db887877191 (diff) | |
Merge pull request #11630 from neheb/nbmv
ffmpeg: add dependency to fdk-aac for ffmpeg-full
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5418ae510..a5c04e7bc 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -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 |