Merge pull request #12572 from alalek:ffmpeg_update_master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 18 Sep 2018 16:12:10 +0000 (16:12 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 18 Sep 2018 16:12:10 +0000 (16:12 +0000)

Trivial merge