diff options
author | Kyle Swanson <k@ylo.ph> | 2020-06-29 09:58:50 -0700 |
---|---|---|
committer | Kyle Swanson <k@ylo.ph> | 2020-07-02 12:56:02 -0700 |
commit | 4979afdb858b6312c7250afde2d669c2880651ce (patch) | |
tree | 48daf2edfae1c2c508bd87c16bc98fcf77e81eb1 | |
parent | f43a8112ddf0388421dc7a264ee9ae12d2185b17 (diff) | |
download | ffmpeg-4979afdb858b6312c7250afde2d669c2880651ce.tar.gz |
configure: remove libvmaf from EXTERNAL_LIBRARY_VERSION3_LIST
since libvmaf v1.5.1, libvmaf has been relicensed as BSD+Patent
Signed-off-by: Kyle Swanson <k@ylo.ph>
-rwxr-xr-x | configure | 4 | ||||
-rw-r--r-- | doc/filters.texi | 2 |
2 files changed, 3 insertions, 3 deletions
@@ -1743,7 +1743,6 @@ EXTERNAL_LIBRARY_VERSION3_LIST=" liblensfun libopencore_amrnb libopencore_amrwb - libvmaf libvo_amrwbenc mbedtls rkmpp @@ -1811,6 +1810,7 @@ EXTERNAL_LIBRARY_LIST=" libtheora libtwolame libv4l2 + libvmaf libvorbis libvpx libwavpack @@ -6385,7 +6385,7 @@ enabled libtwolame && require libtwolame twolame.h twolame_init -ltwolame die "ERROR: libtwolame must be installed and version must be >= 0.3.10"; } enabled libv4l2 && require_pkg_config libv4l2 libv4l2 libv4l2.h v4l2_ioctl enabled libvidstab && require_pkg_config libvidstab "vidstab >= 0.98" vid.stab/libvidstab.h vsMotionDetectInit -enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 1.3.9" libvmaf.h compute_vmaf +enabled libvmaf && require_pkg_config libvmaf "libvmaf >= 1.5.2" libvmaf.h compute_vmaf enabled libvo_amrwbenc && require libvo_amrwbenc vo-amrwbenc/enc_if.h E_IF_init -lvo-amrwbenc enabled libvorbis && require_pkg_config libvorbis vorbis vorbis/codec.h vorbis_info_init && require_pkg_config libvorbisenc vorbisenc vorbis/vorbisenc.h vorbis_encode_init diff --git a/doc/filters.texi b/doc/filters.texi index f17db3b986..ad2448acb2 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -12820,7 +12820,7 @@ The obtained VMAF score is printed through the logging system. It requires Netflix's vmaf library (libvmaf) as a pre-requisite. After installing the library it can be enabled using: -@code{./configure --enable-libvmaf --enable-version3}. +@code{./configure --enable-libvmaf}. If no model path is specified it uses the default model: @code{vmaf_v0.6.1.pkl}. The filter has following options: |