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

[sramacher at users.alioth.debian.org]

Imported Upstream version 3.1.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: df94b03623e383bd3b7fd45296487843fec517d3
X-Git-Newrev: 30f2cbad1f98e543c66032be501b0b2aae19c049

The following commit has been merged in the master branch:
commit 17621a799ee9e6526c7ce084f46c665b5f698596
Merge: df94b03623e383bd3b7fd45296487843fec517d3 c1a7bf0ae231d5bdcd001fb679f43e4e3f655e9d
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Jul 12 01:58:51 2016 +0200

    Merge tag 'upstream/3.1.1'
    
    Upstream version 3.1.1
    
    # gpg: Signature made Tue 12 Jul 2016 01:58:45 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