From f88e04a1bb3b6560c035b762a96e034bb9bfdf9a Mon Sep 17 00:00:00 2001
From: KongQun Yang <kqyang@google.com>
Date: Tue, 17 Nov 2015 17:38:59 -0800
Subject: [PATCH] Update CHANGELOG for v1.2.1

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b4bdcaa903..c2300215b8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## [1.2.1] - 2015-11-18
+### Fixed
+- Fixed a deadlock in MpdBuilder which could lead to program hang #45
+- Fixed a race condition in MpdNotifier which could lead to corrupted mpd #49
+- Improved support for WVM files:
+  - Support files with no PES stream ID metadata.
+  - Support files with multiple audio or video configurations.
+- Fixed a race condition when flushing ThreadedIoFile which may cause flush
+  to be called before file being written; fixed another race condition in
+  ThreadedIoFile if there is an error in reading or writing files.
+- Relaxed requirement on reserved bits when parsing AVCC #44
+- Fixed stropts.h not found issue in CentOS 7.
+
 ## [1.2.0] - 2015-10-01
 ### Added
 - Added [docker](https://www.docker.com/) support. Thanks @leandromoreira.