Merge pull request #22034 from alalek:update_ffmpeg_4.x
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 28 May 2022 02:57:55 +0000 (02:57 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 28 May 2022 02:57:55 +0000 (02:57 +0000)

Trivial merge