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

[sramacher at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit 935f0a82f6de0dd033d0498390e9f1d0f5bb0a91
Merge: 129b047f75e453c5a42163565b9959561846c2fb e305f34fa65a46fc3f654d6f0fbee812a1f7dd5f
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Jun 21 22:04:21 2017 +0200

    Merge tag 'upstream/3.2.6'
    
    Upstream version 3.2.6
    
    # gpg: Signature made 2017-06-21T22:04:17 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