From 4b6705d33d126ed3d66afe4089eb74a21cd66df1 Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 17 May 2020 09:29:09 +0000 Subject: [PATCH] Re-enable cpu-used=7+ in codec_aom when libaom major version > 1. from Brad (maintainer) --- graphics/libavif/patches/patch-src_codec_aom_c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 graphics/libavif/patches/patch-src_codec_aom_c diff --git a/graphics/libavif/patches/patch-src_codec_aom_c b/graphics/libavif/patches/patch-src_codec_aom_c new file mode 100644 index 00000000000..2e93270f536 --- /dev/null +++ b/graphics/libavif/patches/patch-src_codec_aom_c @@ -0,0 +1,17 @@ +$OpenBSD: patch-src_codec_aom_c,v 1.3 2020/05/17 09:29:09 ajacoutot Exp $ + +Re-enable cpu-used=7+ in codec_aom when libaom major version > 1. + +Index: src/codec_aom.c +--- src/codec_aom.c.orig ++++ src/codec_aom.c +@@ -254,7 +254,8 @@ static avifBool aomCodecEncodeImage(avifCodec * codec, + } + } + +- if (image->depth > 8) { ++ int aomMajorVersion = aom_codec_version_major(); ++ if ((aomMajorVersion < 2) && (image->depth > 8)) { + // Due to a known issue with libavif v1.0.0-errata1-avif, 10bpc and + // 12bpc image encodes will call the wrong variant of + // aom_subtract_block when cpu-used is 7 or 8, and crash. Until we get