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

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

Imported Upstream version 2.7.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 091f7a14e1b7aed0b23d50ebc8dd19584b8ea3b6
X-Git-Newrev: 4a46bf3938e2ae0a2b97efa8c92b948a711756fd

The following commit has been merged in the master branch:
commit d274017ac3fc71b3ababf05b46286b582ad8c924
Merge: a14ba603bc6b93092987283f7df46e53297be312 64558500cf7e80ccbece5be945cae8046bdff5d8
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Mon Jul 20 08:05:12 2015 +0200

    Merge tag 'upstream/2.7.2'
    
    Upstream version 2.7.2


-- 
ffmpeg packaging