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

[siretart at users.alioth.debian.org]

New upstream version 3.3.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: cf41c12db5e1eaacba36629d3425b2688e4ec1d6
X-Git-Newrev: 332073afe4212e960c4e8342d7ec23f33b85b163

The following commit has been merged in the master branch:
commit c622d70d19d3f2a47d58837278318284c88452cd
Merge: cf41c12db5e1eaacba36629d3425b2688e4ec1d6 260f2c1869dd11814c213a15ebd62eef6c70297d
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 19 21:45:06 2017 -0400

    Merge tag 'upstream/3.3.2'
    
    Upstream version 3.3.2


-- 
ffmpeg packaging