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

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

Imported Upstream version 2.8.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 36fa84851171237bb38a5c90b368edb0bc825c5c
X-Git-Newrev: b37a6cb403755ea922eca65d47c54524d6ca6ba4

The following commit has been merged in the master branch:
commit 618d5172f096ee98338ca51174f9bb57e444a791
Merge: 36fa84851171237bb38a5c90b368edb0bc825c5c 5e2845189af763afb81fe44b8270359078a749ea
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sun Dec 20 17:16:31 2015 +0100

    Merge tag 'upstream/2.8.4'
    
    Upstream version 2.8.4


-- 
ffmpeg packaging