From 2bba5a4ae862df0378ac38097777c4ee8c6b486d Mon Sep 17 00:00:00 2001
From: Joey Parrish <joeyparrish@google.com>
Date: Mon, 22 Jan 2018 09:47:29 -0800
Subject: [PATCH] Update changelog for 2.3.1 and 2.2.10

Change-Id: I1407217e0e483659c63e0aaefd741552c0e20858
---
 CHANGELOG.md | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f563428c6..48187394f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,58 @@
+## 2.3.1 (2017-01-22)
+
+New features:
+  - All features released in 2.2.10, plus...
+  - DRM content is now implied by DRM config, fixes some ad insertion cases
+    - https://github.com/google/shaka-player/pull/1217
+    - https://github.com/google/shaka-player/issues/1094
+  - Add support for mp4a.40.34 mp3 in HLS
+    - https://github.com/google/shaka-player/issues/1210
+  - Allow ES6 syntax
+  - Replaced deprecated gjslint with eslint
+
+Bugfixes:
+  - All fixes released in 2.2.10, plus...
+  - Handle MPEGTS timestamp rollover issues, including WebVTT HLS
+    - https://github.com/google/shaka-player/issues/1191
+  - Fix MP4 timescale assumptions in HLS
+    - https://github.com/google/shaka-player/issues/1191
+  - Update muxjs to use new keepOriginalTimestamps option
+    - https://github.com/google/shaka-player/issues/1194
+  - Avoids line-length limits when building on Windows
+    - https://github.com/google/shaka-player/issues/1228
+  - Force JS files to use unix newlines on Windows
+    - https://github.com/google/shaka-player/issues/1228
+  - Fix selection of text streams with no role
+    - https://github.com/google/shaka-player/issues/1212
+
+Docs:
+  - All fixes released in 2.2.10, plus...
+  - Fix upgrade guide links
+
+
+## 2.2.10 (2017-01-22)
+
+New features:
+  - Update Widevine HLS parsing support for SAMPLE-AES-CTR
+    - https://github.com/google/shaka-player/issues/1227
+
+Bugfixes:
+  - Fix display of duration in Chrome cast dialog
+    - https://github.com/google/shaka-player/issues/1174
+  - Compensate for rounding errors in multi-period manifests
+  - Delay gap-jumping until after seeking is complete
+    - https://github.com/google/shaka-player/issues/1061
+  - Fix SegmentTemplate w/ duration for live
+    - https://github.com/google/shaka-player/issues/1204
+
+Docs:
+  - Add FAQ entry for file:// requests in Electron
+    - https://github.com/google/shaka-player/issues/1222
+  - Fixed typos and extraneous tags
+  - Added missing @exportDoc annotations
+    - https://github.com/google/shaka-player/pull/1208
+
+
 ## 2.3.0 (2017-12-22)
 
 New features: