[SCM] ffmpeg/master: Finalize changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7e6d4b0697fb2011cce65a95e5bf69d59aee0456
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 3 15:17:18 2016 +0200

    Finalize changelog

diff --git a/debian/changelog b/debian/changelog
index a718455..de93b38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ffmpeg (7:3.1.1-4) unstable; urgency=high
+
+  * debian/control:
+    - Remove obsolete Conflicts.
+    - Remove obsolete Breaks against dmo packages.
+  * debian/patches/fix-vaapi-default-values.patch: Use local independent
+    default values. Thanks to Carl Eugen Hoyos. (Closes: #831529)
+
+ -- Sebastian Ramacher <sramacher at debian.org>  Wed, 03 Aug 2016 15:16:59 +0200
+
 ffmpeg (7:3.1.1-3) unstable; urgency=medium
 
   [ James Clarke ]

-- 
ffmpeg packaging