Merge pull request #19665 from alalek:update_ffmpeg_3.4
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 3 Mar 2021 11:22:56 +0000 (11:22 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 3 Mar 2021 11:22:56 +0000 (11:22 +0000)

Trivial merge