[SCM] ffmpeg/master: Update changelog

[aca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 44310efe06cafd9190932a4dd854215158271b24
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Jan 21 22:40:35 2017 +0100

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 9ad97cf..eefdda9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,14 @@
-ffmpeg (7:3.2.2-2) UNRELEASED; urgency=medium
+ffmpeg (7:3.2.2-2) unstable; urgency=medium
 
-  *
+  * Cherry-pick patches from upstream:
+     - Fix building with chromaprint 1.4. (Closes: #851026)
+     - Fix building with --disable-pic on gcc-4.8.
+     - Fix heap-buffer-overflows when using libopenmpt.
+  * Re-enable chromaprint on sh4 and libx264 on powerpcspe.
+  * Update packaging copyright years.
+  * Switch from libmodplug to libopenmpt. (Closes: #849840)
 
- -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Sat, 21 Jan 2017 22:25:04 +0100
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Sat, 21 Jan 2017 22:39:40 +0100
 
 ffmpeg (7:3.2.2-1) unstable; urgency=medium
 

-- 
ffmpeg packaging