Merge pull request #18119 from tomoaki0705:fixFfmpegBuildFailure
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 17 Aug 2020 19:25:54 +0000 (19:25 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Mon, 17 Aug 2020 19:25:55 +0000 (19:25 +0000)

Trivial merge