[SCM] libav/upstream: Merge remote-tracking branch 'origin/upstream' into upstream

[siretart at users.alioth.debian.org]

Imported Upstream version 9.12
Imported Upstream version 9.11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/upstream
X-Git-Reftype: branch
X-Git-Oldrev: 7078d7e9bb0ad2d37118ba639a5845063f95985b
X-Git-Newrev: 196f8e5371a1fa943bbb184a457b5c0851b59131

The following commit has been merged in the upstream branch:
commit 196f8e5371a1fa943bbb184a457b5c0851b59131
Merge: 63abc6f59968411ecb6d9fbaaf9c748a6025d08b 7078d7e9bb0ad2d37118ba639a5845063f95985b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jul 22 07:52:13 2014 -0400

    Merge remote-tracking branch 'origin/upstream' into upstream
    
    Conflicts:
    	VERSION


-- 
Libav/FFmpeg packaging