[SCM] ffmpeg/master: Finalize changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit add2a7f2e4bcbbe7505b3f5e0df4ae90cf7bc3ea
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jul 12 09:37:55 2016 +0200

    Finalize changelog

diff --git a/debian/changelog b/debian/changelog
index 3ba7ce0..25e8285 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,15 +1,22 @@
-ffmpeg (7:3.1.1-1) UNRELEASED; urgency=medium
+ffmpeg (7:3.1.1-1) unstable; urgency=medium
 
+  * Team upload.
   * New upstream release.
   * debian/rules:
     - Really build with opencv everywhere. (Closes: #827868)
     - Remove obsolete comments.
     - Build with --enable-libebur128.
-  * debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch:
-    Removed, included upstream.
+  * debian/patches
+    - lavf-mpegts-Return-small-probe-score-for-very-short-.patch: Removed,
+      included upstream.
+    - disable-opj-static.patch: Do not define OPJ_STATIC when building against
+      openjpeg 2.1.x.
   * debian/control: Add libebur128-dev to B-D.
+  * debian/copyright:
+    - Add new copyright holders.
+    - Update copyright years.
 
- -- Sebastian Ramacher <sramacher at debian.org>  Tue, 12 Jul 2016 02:20:43 +0200
+ -- Sebastian Ramacher <sramacher at debian.org>  Tue, 12 Jul 2016 09:37:46 +0200
 
 ffmpeg (7:3.0.2-4) unstable; urgency=medium
 

-- 
ffmpeg packaging