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

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

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

The following commit has been merged in the vivid branch:
commit 501104ac5921de4c9bf87f3d9c13d32ee0478e96
Merge: 48925d20afc1c28d34f10eefecef3c806b1a0ea1 891df0854237d9f9cf4c9bf73d9268d9e8f3b176
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Mon Dec 7 20:59:47 2015 +0100

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


-- 
ffmpeg packaging