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)
commita4d16acd0052a43e8b312d119b16004874d56a81
treeffb05a39d21112e67ed49859d5884f80c824fd8b
parent318cba4ce37319ba0b0870aab384d5dc066bb124
parent744798aadd1a268a474d38cd27f2e0844b79fd7b
Merge pull request #15950 from alalek:ffmpeg_update_master