ffmpeg: do not list AAC as patented

Both libraries in the tree (fdk-aac and faad) have patented functionality
disabled when CONFIG_BUILD_PATENTED is off.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in
index 3a405c34ed117679333bcf00161b051c82ffce18..e365dc6ae022f5429d3c9c79473ec74604d4afed 100644 (file)
--- a/multimedia/ffmpeg/Config.in
+++ b/multimedia/ffmpeg/Config.in
@@ -144,7 +144,6 @@ comment "External Libraries"
 config FFMPEG_CUSTOM_SELECT_libfdk-aac
        bool "Fraunhofer FDK AAC encoding library (libfdk-aac)"
        depends on FFMPEG_CUSTOM_NONFREE
-       depends on FFMPEG_CUSTOM_PATENTED
        depends on PACKAGE_fdk-aac
 
 config FFMPEG_CUSTOM_SELECT_libmp3lame

diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 16bbb343bb61b191443e87bdb3ad89a071a38eef..5418ae510810466bed30ee22872aaf129e0b305d 100644 (file)
--- 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:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://ffmpeg.org/releases/