mirror of
https://github.com/novatiq/packages.git
synced 2026-04-30 15:38:40 +01:00
Merge pull request #11625 from neheb/ffmp
ffmpeg: do not list AAC as patented
This commit is contained in:
@@ -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
|
||||||
|
|||||||
@@ -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/
|
||||||
|
|||||||
Reference in New Issue
Block a user