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

[sramacher at users.alioth.debian.org]

Imported Upstream version 3.1.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: 7e6d4b0697fb2011cce65a95e5bf69d59aee0456
X-Git-Newrev: 988fc0c982eeee26269a1b5a3665bc06607996f4

The following commit has been merged in the master branch:
commit 18ad0c7c9dcb1bff9411a0c272c33a503996021a
Merge: 7e6d4b0697fb2011cce65a95e5bf69d59aee0456 9c01f11db3affba54bfb45f01da5ab3d71a13b32
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Aug 10 19:46:53 2016 +0200

    Merge tag 'upstream/3.1.2'
    
    Upstream version 3.1.2
    
    # gpg: Signature made Wed 10 Aug 2016 19:46:50 CEST using RSA key ID 6EA71993
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>"
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>"
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>"
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>"


-- 
ffmpeg packaging