Merge pull request #18284 from alalek:update_ffmpeg_3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Sep 2020 11:26:48 +0000 (11:26 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Sep 2020 11:26:48 +0000 (11:26 +0000)

Trivial merge