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

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

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

The following commit has been merged in the master branch:
commit b484a84438009c6cdff516fe4351431da2886643
Merge: 87b93f4e3ee2b6253ab9f5a166860a1ff18877d5 a5afad73849ba7710a982e6000d805107ab4aa95
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Oct 22 19:28:39 2016 +0200

    Merge tag 'upstream/3.1.5'
    
    Upstream version 3.1.5


-- 
ffmpeg packaging