Merge "Merge tag 'v3.1.2' into HEAD"
diff --git a/AUTHORS b/AUTHORS
index d8711a6..f645f59 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -259,6 +259,7 @@
Wei-Ting Lin <weitinglin@google.com>
Wenyao Liu <wenyao.liu@cidana.com>
Will Bresnahan <bill.wresnahan@gmail.com>
+Xiaoqing Zhu <xzhu@netflix.com>
Xing Jin <ddvfinite@gmail.com>
Xin Zhao <xinzzhao@tencent.com>
Yaowu Xu <yaowu@google.com>
diff --git a/CHANGELOG b/CHANGELOG
index dddef98..f901c43 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,19 @@
+2021-07-20 v3.1.2
+ This release includes several bug fixes.
+
+ - Bug fixes:
+ exports.cmake: use APPLE and WIN32 and use def for mingw-w64
+ https://aomedia-review.googlesource.com/c/aom/+/139882
+
+ Issue 2993: Incorrect spatial_id when decoding base layer of
+ multi-layer stream
+
+ Issue 3080: Chroma Resampling by Encoder on Y4M Inputs Files Tagged
+ as C420mpeg2
+
+ Issue 3081: Use of uninitialized value $version_extra in
+ concatenation (.) or string at aom/build/cmake/version.pl line 88.
+
2021-06-08 v3.1.1
This release includes several bug fixes.
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bc16da..aa7f63b 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 1)
+set(LT_REVISION 2)
set(LT_AGE 1)
math(EXPR SO_VERSION "${LT_CURRENT} - ${LT_AGE}")
set(SO_FILE_VERSION "${SO_VERSION}.${LT_AGE}.${LT_REVISION}")
