Merge pull request #9805 from alalek:ffmpeg_update
authorMaksim Shabunin <maksim.shabunin@gmail.com>
Tue, 10 Oct 2017 09:02:02 +0000 (09:02 +0000)
committerMaksim Shabunin <maksim.shabunin@gmail.com>
Tue, 10 Oct 2017 09:02:02 +0000 (09:02 +0000)

Trivial merge