Merge pull request #15950 from alalek:ffmpeg_update_master
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 20 Nov 2019 07:32:06 +0000 (07:32 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 20 Nov 2019 07:32:06 +0000 (07:32 +0000)

Trivial merge