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

[sramacher at users.alioth.debian.org]

Imported Upstream version 3.0.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: 0f04f0d344d092be1114f5dbf889406de7f2b5fb
X-Git-Newrev: cb7477ab6c308cc22d9f53620b964a075ce075e0

The following commit has been merged in the master branch:
commit 43e042a35adf0464ff9a2f798069bd9400c54a59
Merge: 0f04f0d344d092be1114f5dbf889406de7f2b5fb 1db419b8817a11f77ae959174b120a27ec121cb1
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun May 1 20:58:48 2016 +0200

    Merge tag 'upstream/3.0.2'
    
    Upstream version 3.0.2
    
    # gpg: Signature made Sun 01 May 2016 20:58:44 CEST using RSA key ID 6EA71993
    # gpg: please do a --check-trustdb
    # 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