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

[sramacher at users.alioth.debian.org]

Imported Upstream version 3.1.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 65fcfd6d5351305accb8f65a1d69a9d6f500ab6e
X-Git-Newrev: 2d42850a779f9d1c0e3d9b49e8e0074cae985127

The following commit has been merged in the master branch:
commit f0714b8e07a9400683fe931aee0ee761bf9658a2
Merge: 65fcfd6d5351305accb8f65a1d69a9d6f500ab6e ab532f5a26815959a6fcd97f4fd3a65c3f7abe66
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Fri Aug 26 18:48:00 2016 +0200

    Merge tag 'upstream/3.1.3'
    
    Upstream version 3.1.3
    
    # gpg: keyserver option 'ca-cert-file' is obsolete; please use 'hkp-cacert' in dirmngr.conf
    # gpg: Signature made Fri 26 Aug 2016 18:47:56 CEST using RSA key ID 69F2FC516EA71993
    # gpg: Good signature from "Sebastian Ramacher <sebastian at ramacher.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmail.com>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at gmx.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <s.ramacher at student.tugraz.at>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <sramacher at debian.org>" [ultimate]
    # gpg:                 aka "Sebastian Ramacher <sebastian.ramacher at iaik.tugraz.at>" [ultimate]


-- 
ffmpeg packaging