Merge pull request #18185 from VadimLevin:dev/vlevin/ffmpeg-versions-guard-fix
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 25 Aug 2020 07:29:42 +0000 (07:29 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 25 Aug 2020 07:29:42 +0000 (07:29 +0000)

Trivial merge