[SCM] ffmpeg/master: Update changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit b02308fc284571069c4a39ddec35918562b378b2
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Jul 17 21:23:43 2016 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index 8f0c32e..0ad993b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ffmpeg (7:3.1.1-3) UNRELEASED; urgency=medium
+
+  [ James Clarke ]
+  * debian/rules: Re-enable x264 on sparc64 as the linker has been fixed.
+    (Closes: #831582)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Tue, 12 Jul 2016 17:20:53 +0200
+
 ffmpeg (7:3.1.1-2) unstable; urgency=medium
 
   * Team upload.

-- 
ffmpeg packaging