[SCM] ffmpeg/master: New upstream release

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

The following commit has been merged in the master branch:
commit 3b59077ed317b2906331f1f31c58112a376d51be
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 20:47:42 2016 +0200

    New upstream release

diff --git a/debian/changelog b/debian/changelog
index 68882c4..1209a73 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ffmpeg (7:3.1.4-1) UNRELEASED; urgency=medium
+
+  [ Ondřej Nový ]
+  * Disable librtmp support, because the built-in RTMP support is better.
+
+  [ Andreas Cadhalpun ]
+  * Import new upstream bugfix release 3.1.4.
+
+ -- Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>  Tue, 11 Oct 2016 20:45:44 +0200
+
 ffmpeg (7:3.1.3-2) unstable; urgency=medium
 
   * Team upload.

-- 
ffmpeg packaging