Merge pull request #11625 from neheb/ffmp

ffmpeg: do not list AAC as patented
This commit is contained in:
Rosen Penev
2020-03-21 21:03:10 -07:00
committed by GitHub
2 changed files with 1 additions and 2 deletions
-1
View File
@@ -144,7 +144,6 @@ comment "External Libraries"
config FFMPEG_CUSTOM_SELECT_libfdk-aac config FFMPEG_CUSTOM_SELECT_libfdk-aac
bool "Fraunhofer FDK AAC encoding library (libfdk-aac)" bool "Fraunhofer FDK AAC encoding library (libfdk-aac)"
depends on FFMPEG_CUSTOM_NONFREE depends on FFMPEG_CUSTOM_NONFREE
depends on FFMPEG_CUSTOM_PATENTED
depends on PACKAGE_fdk-aac depends on PACKAGE_fdk-aac
config FFMPEG_CUSTOM_SELECT_libmp3lame config FFMPEG_CUSTOM_SELECT_libmp3lame
+1 -1
View File
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ffmpeg PKG_NAME:=ffmpeg
PKG_VERSION:=3.4.7 PKG_VERSION:=3.4.7
PKG_RELEASE:=2 PKG_RELEASE:=3
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/