[SCM] ffmpeg/master: Merge tag 'upstream/3.1.4'

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

New upstream version 3.1.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 15ab19c0a11b9bbf66a4e3d068f3dfe54c4e5886
X-Git-Newrev: 87b93f4e3ee2b6253ab9f5a166860a1ff18877d5

The following commit has been merged in the master branch:
commit b4fbc9c527bb0f1c8e4900cdd6f6a6e1bf0c2cbd
Merge: 15ab19c0a11b9bbf66a4e3d068f3dfe54c4e5886 4bfae37fe72d86e124f4c372d2d019cb2af5e734
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Oct 11 20:45:37 2016 +0200

    Merge tag 'upstream/3.1.4'
    
    Upstream version 3.1.4


-- 
ffmpeg packaging