[SCM] ffmpeg/master: Update changelog

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 30f2cbad1f98e543c66032be501b0b2aae19c049
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jul 12 02:21:15 2016 +0200

    Update changelog

diff --git a/debian/changelog b/debian/changelog
index f2a32fd..4c579a4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-ffmpeg (7:3.0.2-5) UNRELEASED; urgency=medium
+ffmpeg (7:3.1.1-2) UNRELEASED; urgency=medium
 
+  * New upstream release.
   * debian/rules: Really build with opencv everywhere (Closes: #827868)
+  * debian/patches/lavf-mpegts-Return-small-probe-score-for-very-short-.patch:
+    Removed, included upstream.
 
- -- Sebastian Ramacher <sramacher at debian.org>  Wed, 22 Jun 2016 08:41:22 +0200
+ -- Sebastian Ramacher <sramacher at debian.org>  Tue, 12 Jul 2016 02:20:43 +0200
 
 ffmpeg (7:3.0.2-4) unstable; urgency=medium
 

-- 
ffmpeg packaging