Merge pull request #109405 from primeos/ffmpeg-full-disable-rav1e

ffmpeg-full: disable rav1e by default (in favor of svt-av1)
This commit is contained in:
Michael Weiss 2021-01-16 20:35:27 +01:00 committed by GitHub
commit a6d138c7ad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions

View File

@ -15,8 +15,23 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "AV1-compliant encoder/decoder library core";
homepage = "https://github.com/AOMediaCodec/SVT-AV1";
license = licenses.bsd2;
longDescription = ''
The Scalable Video Technology for AV1 (SVT-AV1 Encoder and Decoder) is an
AV1-compliant encoder/decoder library core. The SVT-AV1 encoder
development is a work-in-progress targeting performance levels applicable
to both VOD and Live encoding / transcoding video applications. The
SVT-AV1 decoder implementation is targeting future codec research
activities.
'';
inherit (src.meta) homepage;
changelog = "https://github.com/AOMediaCodec/SVT-AV1/blob/v${version}/CHANGELOG.md";
license = with licenses; [
bsd2
{
fullName = "Alliance for Open Media Patent License 1.0";
url = "https://aomedia.org/license/patent-license/";
}
];
platforms = platforms.unix;
broken = stdenv.isAarch64; # undefined reference to `cpuinfo_arm_linux_init'
maintainers = with maintainers; [ chiiruno ];

View File

@ -13375,6 +13375,7 @@ in
ffmpeg-full = callPackage ../development/libraries/ffmpeg-full {
svt-av1 = if stdenv.isAarch64 then null else svt-av1;
rav1e = null; # We already have SVT-AV1 for faster encoding
# The following need to be fixed on Darwin
libjack2 = if stdenv.isDarwin then null else libjack2;
libmodplug = if stdenv.isDarwin then null else libmodplug;