[SCM] ffmpeg/wily: Merge tag 'upstream/2.7.4' into wily

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

Imported Upstream version 2.7.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/wily
X-Git-Reftype: branch
X-Git-Oldrev: c33e57bdfd26a0cd5d65b94834a5833203dd27a7
X-Git-Newrev: 14e1634a5ac5ad90884098f127d260b47fc30018

The following commit has been merged in the wily branch:
commit 5b099eac62a61a6efcddc93fa7065b144e97d3d0
Merge: c33e57bdfd26a0cd5d65b94834a5833203dd27a7 cb4cb40587b2adba3f4fcf02af0782101877f34c
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Dec 22 19:58:05 2015 +0100

    Merge tag 'upstream/2.7.4' into wily
    
    Upstream version 2.7.4


-- 
ffmpeg packaging