Merge "Merge tag 'v3.1.1' into origin/master"
diff --git a/CHANGELOG b/CHANGELOG
index efd07b3..dddef98 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,26 @@
+2021-06-08 v3.1.1
+ This release includes several bug fixes.
+
+ - Bug fixes:
+ Issue 2965: Cherry-picked the following four commits for the
+ tune=butteraugli mode.
+ 1. Add libjxl to pkg_config if enabled:
+ https://aomedia-review.googlesource.com/c/aom/+/136044
+ 2. Declare set_mb_butteraugli_rdmult_scaling static:
+ https://aomedia-review.googlesource.com/c/aom/+/134506
+ 3. Add color range detection in tune=butteraugli mode:
+ https://aomedia-review.googlesource.com/c/aom/+/135521
+ 4. Enable tune=butteraugli in all-intra mode:
+ https://aomedia-review.googlesource.com/c/aom/+/136082
+
+ Issue 3021: Fix vmaf model initialization error when not set to
+ tune=vmaf
+
+ Issue 3050: Compilation fails with -DCONFIG_TUNE_VMAF=1
+
+ Issue 3054: Consistent crash on near-static screen content, keyframe
+ related
+
2021-05-03 v3.1.0
This release adds an "all intra" mode to the encoder, which significantly
speeds up the encoding of AVIF still images at speed 6.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9d6eea1..7237f8b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,7 +48,7 @@
#
# We set SO_FILE_VERSION = [c-a].a.r
set(LT_CURRENT 4)
-set(LT_REVISION 0)
+set(LT_REVISION 1)
set(LT_AGE 1)
math(EXPR SO_VERSION "${LT_CURRENT} - ${LT_AGE}")
set(SO_FILE_VERSION "${SO_VERSION}.${LT_AGE}.${LT_REVISION}")
