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

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

New upstream version 3.2.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: e07aa55c4751d1c75870e2fb914c6b0d262bb76b
X-Git-Newrev: 242b7a52bee78c88653d094a11315357a6e888be

The following commit has been merged in the master branch:
commit d12122db924af0bf574a60ae2197daf1aee59135
Merge: e07aa55c4751d1c75870e2fb914c6b0d262bb76b 8b6ab9ed5b9b21f9654bed6532f61364be01a41d
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Tue Dec 6 23:51:19 2016 +0100

    Merge tag 'upstream/3.2.2'
    
    Upstream version 3.2.2


-- 
ffmpeg packaging