[SCM] ffmpeg/master: Merge branch 'master' of ssh+git://git.debian.org/git/pkg-multimedia/ffmpeg

[sramacher at users.alioth.debian.org]

Enable OCR using Tesseract in libavfilter-extra*
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: a12df59f2d88f52c06135bc76cb38e25ef523d60
X-Git-Newrev: c05c9e0e58930920e718094b1dd629fd174ed7ab

The following commit has been merged in the master branch:
commit 09d19c10ea6d30d0dc71dcb83bbc05d03f8a60b3
Merge: 34a6685a86bb8e00bacf683a902414344bd8755a a12df59f2d88f52c06135bc76cb38e25ef523d60
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Wed Sep 28 20:49:19 2016 +0200

    Merge branch 'master' of ssh+git://git.debian.org/git/pkg-multimedia/ffmpeg


-- 
ffmpeg packaging