[SCM] ffmpeg/vivid: Merge tag 'upstream/2.5.8' into vivid

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

Imported Upstream version 2.5.8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/vivid
X-Git-Reftype: branch
X-Git-Oldrev: 7c52ea64a9020012c7d51950312011c12ea74411
X-Git-Newrev: 48925d20afc1c28d34f10eefecef3c806b1a0ea1

The following commit has been merged in the vivid branch:
commit 7eed1202c4ef7d46a343dc94f358b70e57faa3b8
Merge: 7c52ea64a9020012c7d51950312011c12ea74411 c24ceeb32bdb278c0e54a35e601645d08347a987
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Fri Jul 31 13:51:43 2015 +0200

    Merge tag 'upstream/2.5.8' into vivid
    
    Upstream version 2.5.8


-- 
ffmpeg packaging