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

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

Imported Upstream version 2.5.10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/vivid
X-Git-Reftype: branch
X-Git-Oldrev: b71f8bbfa7b48f4e4220f6e483598d94ac5027c9
X-Git-Newrev: 19b16909ab0dc9b2a8aa83f97252c1c8f797ec6f

The following commit has been merged in the vivid branch:
commit 8a3d5cd912e33d5aba69a507d1ac6eb160cb3350
Merge: b71f8bbfa7b48f4e4220f6e483598d94ac5027c9 f795c4f153724cdbd167b4c42a0e450a1025b79c
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Jan 19 20:24:18 2016 +0100

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


-- 
ffmpeg packaging