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

[sramacher at users.alioth.debian.org]

New upstream version 3.2.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: ec09d70da80173b1bc271e863865ec41595c299a
X-Git-Newrev: 8cbc333e8ed59b666f777e25751ef1db78fefd35

The following commit has been merged in the master branch:
commit ce72d43b38daecddfa24beed1d30f6daddb5f5dd
Merge: ec09d70da80173b1bc271e863865ec41595c299a 6c0ca730f2e4de1efccdf38ec42ce0baaf9e40a4
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Mon May 22 21:55:13 2017 +0200

    Merge tag 'upstream/3.2.5'
    
    Upstream version 3.2.5
    
    # gpg: Signature made 2017-05-22T21:55:12 CEST
    # gpg:                using RSA key F78CBA07817BB149A11D339069F2FC516EA71993
    # gpg:                issuer "sramacher at debian.org"
    # 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