[SCM] libav/master: Merge tag 'upstream/11.4'

[siretart at users.alioth.debian.org]

Imported Upstream version 11.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: bf509c70bff5142a438c1b9d9a6d782346fa9e58
X-Git-Newrev: c67ee44b356dda09babd2503e26a2714f5b936f0

The following commit has been merged in the master branch:
commit 2826bdfc1d154a16ce849b5fa29dd39527af1b35
Merge: bf509c70bff5142a438c1b9d9a6d782346fa9e58 ed24c5494765a6acae434957235bbed214502639
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun May 31 13:07:23 2015 -0400

    Merge tag 'upstream/11.4'
    
    Upstream version 11.4


-- 
Libav/FFmpeg packaging