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

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

Imported Upstream version 2.7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d6b38ab67c9f6f62c2839ac78393c4ddb835ee25
X-Git-Newrev: 84e2a37e763a2724ee9762ec7609805fd9d38ce8

The following commit has been merged in the master branch:
commit 0751301af32f71af279c7516744d61601ded2398
Merge: d6b38ab67c9f6f62c2839ac78393c4ddb835ee25 3c75df37f3968d099e7006feb76c7c4f393a50b8
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Wed Jun 10 21:25:26 2015 +0200

    Merge tag 'upstream/2.7'
    
    Upstream version 2.7


-- 
ffmpeg packaging