Merge pull request #8602 from alalek:ffmpeg_update
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 13:01:55 +0000 (13:01 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 3 May 2017 13:01:55 +0000 (13:01 +0000)

Trivial merge