Merge pull request #19663 from mshabunin:fix-ffmpeg-1x
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Mar 2021 12:19:00 +0000 (12:19 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 2 Mar 2021 12:19:00 +0000 (12:19 +0000)

Trivial merge