Merge pull request #20244 from alalek:update_ffmpeg_4.x
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Jun 2021 19:23:25 +0000 (19:23 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 8 Jun 2021 19:23:25 +0000 (19:23 +0000)

Trivial merge