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

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

Imported Upstream version 2.8.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: b37a6cb403755ea922eca65d47c54524d6ca6ba4
X-Git-Newrev: 83adb4991dd7d6fbadd46daf173e77be70a20df3

The following commit has been merged in the master branch:
commit fb02174c6bbd948984cc4921678a83c016c13d6b
Merge: b37a6cb403755ea922eca65d47c54524d6ca6ba4 00c203d72483768a442cf285b802a6592a746712
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Fri Jan 15 19:44:28 2016 +0100

    Merge tag 'upstream/2.8.5'
    
    Upstream version 2.8.5


-- 
ffmpeg packaging