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

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

New upstream version 3.2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 66d52434666e933ec7b42e6bcd1128e02a8c1a62
X-Git-Newrev: e07aa55c4751d1c75870e2fb914c6b0d262bb76b

The following commit has been merged in the master branch:
commit d43e446a64332a99f6350119fe16d6ff896b4429
Merge: 66d52434666e933ec7b42e6bcd1128e02a8c1a62 dbdc7a308bc50b145f207f57fb104c51cbd82a17
Author: Andreas Cadhalpun <Andreas.Cadhalpun at googlemail.com>
Date:   Sat Nov 26 23:42:10 2016 +0100

    Merge tag 'upstream/3.2.1'
    
    Upstream version 3.2.1


-- 
ffmpeg packaging